From f754ec1a8f003c29fcf2a2b99e11116575a76cdd Mon Sep 17 00:00:00 2001 From: Andris Reinman Date: Fri, 14 Sep 2018 23:28:48 +0300 Subject: [PATCH 1/2] removed tor/onion --- setup/04_install_import_keys.sh | 11 ----------- setup/05_install_packages.sh | 10 +--------- setup/09_install_zone_mta.sh | 7 ------- 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/setup/04_install_import_keys.sh b/setup/04_install_import_keys.sh index ab1eac65..e865ab2b 100644 --- a/setup/04_install_import_keys.sh +++ b/setup/04_install_import_keys.sh @@ -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 diff --git a/setup/05_install_packages.sh b/setup/05_install_packages.sh index 4f1646a7..f7b7026b 100644 --- a/setup/05_install_packages.sh +++ b/setup/05_install_packages.sh @@ -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 diff --git a/setup/09_install_zone_mta.sh b/setup/09_install_zone_mta.sh index 2925d9fc..abcb3c45 100644 --- a/setup/09_install_zone_mta.sh +++ b/setup/09_install_zone_mta.sh @@ -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 From 80d2702e465d72df46a5ff1625c58d11738a3ad9 Mon Sep 17 00:00:00 2001 From: Andris Reinman Date: Fri, 14 Sep 2018 23:29:13 +0300 Subject: [PATCH 2/2] updated hash --- setup/01_install_commits.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/01_install_commits.sh b/setup/01_install_commits.sh index 4080a09f..b360fd88 100644 --- a/setup/01_install_commits.sh +++ b/setup/01_install_commits.sh @@ -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"