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 cab9ef703ea8e91f2937a1f994f7c8ecd173a4ce..a4ab265bd48fbe06802a69372bebc274579bd37e 100644 (file)
--- 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
 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
 
 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 a6a6655e4dc919833e4bab4c4444a77007a2c11c..664adb0cbdf6a224de63382bb957b492978ce008 100644 (file)
--- 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.
 # 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
 #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
 
 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
 
 #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
 
 
 # temp work-around for d-l-f
 

diff --git a/update_spamassassin b/update_spamassassin
index 3a15e883ca5d63070014862da8be58cd2f0b2d87..12ff0c313c4f42fba7e898758542a2b45331c73a 100755 (executable)
--- 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";
 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
     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
 
 if [ "$HOSTNAME" == "rietz" ]; then
     touch /home/debbugs/.spamassassin/user_prefs

-elif [ "$HOSTNAME" == "liszt" ]; then
+elif [ "$HOSTNAME" == "bendel" ]; then

     # do nothing
     true;
 else
     # do nothing
     true;
 else