fix userconf dir in update_sa; move bts only scores over

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-listmaster/trunk/spamassassin_config@97 0b7a5b0c-1f2c-0410-bd74-c376f8064c91

diff --git a/common/bts_scores b/common/bts_scores
index 2f50064795e3acdfe4d3ef420f0ad29cdddddf96..dab7343a68a2ca22dc251e4f0fee61aa2f6e5e7d 100644 (file)
--- a/common/bts_scores
+++ b/common/bts_scores
@@ -46,6 +46,9 @@ score HTML_70_80              1.682 1.379 1.310 1.254
 score HTML_80_90               1.406 1.483 1.163 1.166
 score HTML_90_100              1.500 1 1 1
 
+score HTML_WEB_BUGS            2.542 2.100 2.100 2.100
+
+
 # and these get 1 point for being pr0n
 score PORN_16                  3.896 3.896 3.166 3.799
 score PORN_15                  3.900 3.900 2.666 3.900
@@ -103,6 +106,20 @@ score RCVD_IN_SORBS_SOCKS 0.1
 score RCVD_IN_SORBS_WEB 0.1
 score RCVD_IN_SORBS_ZOMBIE 0.1
 
+
+# The following were originally in common/scores but don't exist in
+# the version of SA running on murphy.
+# don't trust RBLs so much, esp. not dialup lists, moved them towards 0
+# --joy, 2003-07-19
+score RCVD_IN_RFCI             0.0 0.1 0.0 0.092
+score RCVD_IN_ORBS             0.0 0.0 0.0 0.114
+score RCVD_IN_UNCONFIRMED_DSBL 0.0 0.012 0.0 0.0
+score RCVD_IN_NJABL            0.0 0.053 0.0 0.344
+# relays.osirusoft.com is gone --joy, 2003-08-27
+# score RCVD_IN_OSIRUSOFT_COM 0
+score RCVD_IN_SORBS 0.2
+
+
 # blarson 2004-11-16
 # other network checks -- also disable
 # blarson 2005-10-29 enable again

diff --git a/common/scores b/common/scores
index 267657aa095e070c86a723dace7ba8658a750fd3..7bce81fe144c85bf94ca68297448dc131f048094 100644 (file)
--- a/common/scores
+++ b/common/scores
@@ -16,7 +16,6 @@ score LDOSUBSCRIBER           -6
 score FROM_AND_TO_SAME         4.097 3.826 4.197 3.464
 # score MASS_EMAIL             2.0 2.0 2.0 2.482
 # score BASE64_ENC_TEXT                4.354 3.643 3.544 3.768
-score HTML_WEB_BUGS            2.542 2.100 2.100 2.100
 score EXCUSE_10                        2.069 2.0 2.0 2.0
 score MIME_HTML_ONLY           4
 # score CLICK_BELOW            2.489 2.101 2.100 2
@@ -72,15 +71,6 @@ score BAYES_95 0 0 2 2
 # score BAYES_99 0 0  3  3
 score BAYES_99 4
 
-# don't trust RBLs so much, esp. not dialup lists, moved them towards 0
-# --joy, 2003-07-19
-score RCVD_IN_RFCI             0.0 0.1 0.0 0.092
-score RCVD_IN_ORBS             0.0 0.0 0.0 0.114
-score RCVD_IN_UNCONFIRMED_DSBL 0.0 0.012 0.0 0.0
-score RCVD_IN_NJABL            0.0 0.053 0.0 0.344
-# relays.osirusoft.com is gone --joy, 2003-08-27
-# score RCVD_IN_OSIRUSOFT_COM 0
-score RCVD_IN_SORBS 0.2
 # sometimes kills off valid excite etc users, and doesn't detect much spam
 # so -1 point from 2.55 default --joy, 2003-07-19
 score RCVD_FAKE_HELO_DOTCOM    0.791 1.606 1.264 2.434

diff --git a/update_spamassassin b/update_spamassassin
index 00c540f48d05306f3b822b387d545415187c9c62..2610c9ede227861876f383d0c11f5e8796541084 100755 (executable)
--- a/update_spamassassin
+++ b/update_spamassassin
@@ -14,7 +14,7 @@ if [ "$HOSTNAME" == "rietz" ]; then
     USERCONF="bugs/user_prefs";
 elif [ "$HOSTNAME" == "murphy" ]; then
     BASEDIR="/var/list/.etc";
-    USERCONF="bugs/user_prefs";
+    USERCONF="lists/user_prefs";
 else
     echo "Unknown hostname '$HOSTNAME'";
     exit 1;
@@ -32,7 +32,7 @@ if [ $ORIGREV -ge $NEWREV ]; then
     exit 0;
 fi;
 
-if [ -e "$SACONFIG/.update_spamassassin" ] && kill -0 $(cat "$SACONFIG/.update_spamassassin"); then
+if [ -e "$SACONFIG/.update_spamassassin" ] && kill -0 $(cat "$SACONFIG/.update_spamassassin") >/dev/null 2>&1; then
     echo "Another update_spamassassin appears to be running"
     exit 1;
 else