From 53d4820d749173387b23bf87a32f68a071919787 Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Fri, 17 Jul 2015 11:13:15 +0000 Subject: [PATCH 1/4] hard-code pyzor sevice URL because 'pyzor discover' is failing because Sourceforge is offline, fixes #496 --- setup/spamassassin.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/setup/spamassassin.sh b/setup/spamassassin.sh index 2833c5fb..9816204b 100755 --- a/setup/spamassassin.sh +++ b/setup/spamassassin.sh @@ -22,8 +22,18 @@ apt_install spampd razor pyzor dovecot-antispam tools/editconf.py /etc/default/spamassassin \ CRON=1 -# Configure pyzor. -hide_output pyzor discover +# Configure pyzor, which is a client to a live database of hashes of +# spam emails. Set the pyzor configuration directory to something sane. +# The default is ~/.pyzor. We used to use that, so we'll kill that old +# directory. Then write the public pyzor server to its servers file. +# That will prevent an automatic download on first use, and also means +# we can skip 'pyzor discover', both of which are currently broken by +# something happening on Sourceforge (#496). +rm -rf ~/.pyzor +tools/editconf.py /etc/spamassassin/local.cf -s \ + pyzor_options="--homedir /etc/spamassassin/pyzor" +echo "public.pyzor.org:24441" > /etc/spamassassin/pyzor/servers +# check with: pyzor --homedir /etc/mail/spamassassin/pyzor ping # Configure spampd: # * Pass messages on to docevot on port 10026. This is actually the default setting but we don't From 1a995d9e26aa88289821c7ece899122b0c940ea1 Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Fri, 17 Jul 2015 20:26:17 -0400 Subject: [PATCH 2/4] forgot to create the pyzor home_dir in 3f606feea3a3bb4262ae49aec9ec3dd9b4abd6ef --- setup/spamassassin.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/setup/spamassassin.sh b/setup/spamassassin.sh index 9816204b..b6aaa67e 100755 --- a/setup/spamassassin.sh +++ b/setup/spamassassin.sh @@ -32,6 +32,7 @@ tools/editconf.py /etc/default/spamassassin \ rm -rf ~/.pyzor tools/editconf.py /etc/spamassassin/local.cf -s \ pyzor_options="--homedir /etc/spamassassin/pyzor" +mkdir -p /etc/spamassassin/pyzor echo "public.pyzor.org:24441" > /etc/spamassassin/pyzor/servers # check with: pyzor --homedir /etc/mail/spamassassin/pyzor ping From e11825392d80ca419bd0f9b30a56c6899151466b Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Fri, 17 Jul 2015 20:27:35 -0400 Subject: [PATCH 3/4] use a temporary mirror for roundcube while Sourceforge is recovering from an outage https://twitter.com/sfnet_ops/status/622171668497076224 --- setup/webmail.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/webmail.sh b/setup/webmail.sh index 05ea35c4..8826c89b 100755 --- a/setup/webmail.sh +++ b/setup/webmail.sh @@ -49,7 +49,7 @@ if [ $needs_update == 1 ]; then # install roundcube echo installing Roundcube webmail $VERSION... wget_verify \ - http://downloads.sourceforge.net/project/roundcubemail/roundcubemail/$VERSION/roundcubemail-$VERSION.tar.gz \ + https://mailinabox.email/mirror/roundcubemail-$VERSION.tar.gz \ $HASH \ /tmp/roundcube.tgz tar -C /usr/local/lib -zxf /tmp/roundcube.tgz From 1b00184c89eacbd1a02bc15615ab771a72c80eb4 Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Sun, 19 Jul 2015 08:30:03 -0400 Subject: [PATCH 4/4] v0.12c release to work-around Sourceforge outage --- CHANGELOG.md | 2 ++ README.md | 4 ++-- setup/bootstrap.sh | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 626841eb..6d2838f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ This is a minor update to v0.11, which was a major update. Please read v0.11's a * v0.12b was posted shortly after the initial posting of v0.12 correcting a minor regression in v0.12 related to creating aliases targetting multiple addresses. +* v0.12c was posted on July 19, 2015 to work around the current Sourceforge.net outage: pyzor's remote server is now hard-coded rather than accessing a file hosted on Sourceforge, and roundcube is now downloaded from a Mail-in-a-Box mirror rather than from Sourceforge. + * The administrator@ alias was incorrectly created starting with v0.11. If your first install was v0.11, check that the administrator@ alias forwards mail to you. * Intrusion detection rules (fail2ban) are relaxed (i.e. less is blocked). * SSL certificates could not be installed for the new automatic 'www.' redirect domains. diff --git a/README.md b/README.md index 06701f7d..f1025bee 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ I sign the release tags on git. To verify that a tag is signed by me, you can pe $ cd mailinabox # Verify the tag. - $ git verify-tag v0.12b + $ git verify-tag v0.12c gpg: Signature made ..... using RSA key ID C10BDD81 gpg: Good signature from "Joshua Tauberer " gpg: WARNING: This key is not certified with a trusted signature! @@ -65,7 +65,7 @@ I sign the release tags on git. To verify that a tag is signed by me, you can pe Primary key fingerprint: 5F4C 0E73 13CC D744 693B 2AEA B920 41F4 C10B DD81 # Check out the tag. - $ git checkout v0.12b + $ git checkout v0.12c The key ID and fingerprint above should match my [Keybase.io key](https://keybase.io/joshdata) and the fingerprint I publish on [my homepage](https://razor.occams.info/). diff --git a/setup/bootstrap.sh b/setup/bootstrap.sh index c281b072..e4aaccd2 100644 --- a/setup/bootstrap.sh +++ b/setup/bootstrap.sh @@ -7,7 +7,7 @@ ######################################################### if [ -z "$TAG" ]; then - TAG=v0.12b + TAG=v0.12c fi # Are we running as root?