Merge branch 'master' of github.com:nodemailer/wildduck

This commit is contained in:
Andris Reinman 2018-09-20 11:49:47 +03:00
commit 4b689abe62
4 changed files with 2 additions and 28 deletions

View file

@ -6,7 +6,7 @@ NODEREPO="node_10.x"
MONGODB="3.6"
CODENAME=`lsb_release -c -s`
WILDDUCK_COMMIT="1dc693d0fe6735b8832671a90cae19bbd294a87a"
WILDDUCK_COMMIT="f754ec1a8f003c29fcf2a2b99e11116575a76cdd"
ZONEMTA_COMMIT="a84467fc4e576e0939f18270997f598d9e2830f7" # zone-mta-template
WEBMAIL_COMMIT="97085f77008104288bc1b3cf7360d3295a886706"
WILDDUCK_ZONEMTA_COMMIT="3dc9bad86a0d1cbdd18e7d28fcfe89c3ca7438e0"

View file

@ -31,17 +31,6 @@ wget -qO- https://www.mongodb.org/static/pgp/server-${MONGODB}.asc | sudo apt-ke
# hardcode xenial as at this time there are no non-dev packages for bionic (http://repo.mongodb.org/apt/ubuntu/dists/)
echo "deb [ arch=amd64,arm64 ] http://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/$MONGODB multiverse" > /etc/apt/sources.list.d/mongodb-org.list
# tor keys
# Setup tor to be able to send emails to .onion network.
# Receiving from onion is not automatically set up, you would have to
# create a hidden servcie first and then bridge port 25
# uncomment if you want to support TOR
#echo "deb http://deb.torproject.org/torproject.org $CODENAME main
#deb-src http://deb.torproject.org/torproject.org $CODENAME main" > /etc/apt/sources.list.d/tor.list
#gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89
#gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
# rspamd
wget -O- https://rspamd.com/apt-stable/gpg.key | apt-key add -
echo "deb http://rspamd.com/apt-stable/ $CODENAME main" > /etc/apt/sources.list.d/rspamd.list

View file

@ -6,15 +6,7 @@ echo -e "\n-- Executing ${ORANGE}${OURNAME}${NC} subscript --"
# install nginx
apt-get update
apt-get -q -y install pwgen git ufw build-essential libssl-dev dnsutils python software-properties-common nginx wget
# install tor
apt-get update
apt-get -q -y install mongodb-org nodejs redis-server clamav clamav-daemon
# uncomment if you want to support tor
#apt-get -q -y install tor deb.torproject.org-keyring
apt-get -q -y install pwgen git ufw build-essential libssl-dev dnsutils python software-properties-common nginx wget mongodb-org nodejs redis-server clamav clamav-daemon
# rspamd
apt-get -q -y --no-install-recommends install rspamd

View file

@ -60,12 +60,6 @@ enabled=\"sender\"
secret=\"$ZONEMTA_SECRET\"
algo=\"md5\"" > /etc/zone-mta/plugins/loop-breaker.toml
echo '["modules/zonemta-onion"]
enabled=["sender"]
["modules/zonemta-onion".proxy]
host="127.0.0.1"
port=9050' > /etc/zone-mta/plugins/onion.toml
echo "[wildduck]
enabled=[\"receiver\", \"sender\"]
@ -110,7 +104,6 @@ DKIM_JSON=`DOMAIN="$MAILDOMAIN" SELECTOR="$DKIM_SELECTOR" node -e 'console.log(J
cd /opt/zone-mta
npm install --unsafe-perm --production
npm install zonemta-onion --save
cd /opt/zone-mta/plugins/wildduck
npm install --unsafe-perm --production