From: Martin Zobel-Helas Date: Sun, 22 Apr 2012 11:22:58 +0000 (+0000) Subject: s/liszt/bendel/ X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=commitdiff_plain;h=e1a86083b3a538e10dbdb001607874b62c9823e8 s/liszt/bendel/ git-svn-id: svn+ssh://svn.debian.org/svn/pkg-listmaster/trunk/spamassassin_config@416 0b7a5b0c-1f2c-0410-bd74-c376f8064c91 --- diff --git a/common/debian_specific b/common/debian_specific index cab9ef7..a4ab265 100644 --- a/common/debian_specific +++ b/common/debian_specific @@ -23,7 +23,7 @@ describe MURPHY_DEBIAN_MESSAGE Found Debian-Header. score MURPHY_DEBIAN_MESSAGE -10 # joy, 2003-08-17 -header OUR_MTA_MSGID Message-Id =~ /\@(master|liszt|gluck)\.debian\.org/ +header OUR_MTA_MSGID Message-Id =~ /\@(master|bendel|gluck)\.debian\.org/ describe OUR_MTA_MSGID Sounds like a msgid autogenerated by our MTAs score OUR_MTA_MSGID 2 diff --git a/common/list_specific b/common/list_specific index a6a6655..664adb0 100644 --- a/common/list_specific +++ b/common/list_specific @@ -3,12 +3,12 @@ # our MTAs fix up headers for a slew of spams, so mark these as suspicious # -- joy, 2003-06-28 # deactivated as this rule is also part of SA itself. -#header OUR_MTA_MSGID Message-Id =~ /\@(liszt|master|gluck)\.debian\.org/ +#header OUR_MTA_MSGID Message-Id =~ /\@(bendel|master|gluck)\.debian\.org/ #describe OUR_MTA_MSGID Sounds like a MsgId autogenerated by our MTAs #score OUR_MTA_MSGID 1 # -- joy, 2003-08-15 -header SENDER_FOR_US From =~ /\@(liszt|master|gluck|lists)\.debian\.org/ +header SENDER_FOR_US From =~ /\@(bendel|master|gluck|lists)\.debian\.org/ describe SENDER_FOR_US Sounds like a mail aimed at tricking our MTAs score SENDER_FOR_US 2 @@ -46,9 +46,9 @@ score MDOMOSUBS -2 #describe OURCRONMAILS Sounds like a legitimate cron job mail #score OURCRONMAILS -3 -header LISZT_LOCAL_FORWARDED Resent-From =~ /liszt\.debian\.org/ -describe LISZT_LOCAL_FORWARDED Mail has been locally forwarded. -score LISZT_LOCAL_FORWARDED -5 +header BENDEL_LOCAL_FORWARDED Resent-From =~ /bendel\.debian\.org/ +describe BENDEL_LOCAL_FORWARDED Mail has been locally forwarded. +score BENDEL_LOCAL_FORWARDED -5 # temp work-around for d-l-f diff --git a/update_spamassassin b/update_spamassassin index 3a15e88..12ff0c3 100755 --- a/update_spamassassin +++ b/update_spamassassin @@ -14,7 +14,7 @@ HOSTNAME=$(hostname); if [ "$HOSTNAME" = "rietz" ] || [ "$HOSTNAME" = "busoni" ]; then BASEDIR="/org/bugs.debian.org" USERCONF="bugs/user_prefs"; -elif [ "$HOSTNAME" = "liszt" ]; then +elif [ "$HOSTNAME" = "bendel" ]; then BASEDIR="/var/list/.etc"; USERCONF="lists/user_prefs"; else @@ -100,7 +100,7 @@ rm -rf "$TMPDIR" if [ "$HOSTNAME" == "rietz" ]; then touch /home/debbugs/.spamassassin/user_prefs -elif [ "$HOSTNAME" == "liszt" ]; then +elif [ "$HOSTNAME" == "bendel" ]; then # do nothing true; else