X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=common%2Furl_spam;h=bb76063f19d4bc73d06913877c98510a6784d066;hp=b7989d2dfdf6f9398bc89ea9741be34e240da120;hb=a41f744a1d96220e3c83279cdcbdf83b773cf6b8;hpb=ae1e0bc72fd433be2419c13aa6b9aace1b9d3c08

diff --git a/common/url_spam b/common/url_spam
index b7989d2..bb76063 100644
--- a/common/url_spam
+++ b/common/url_spam
@@ -66,9 +66,10 @@ describe CANDYHOS	spams from korea, hosts in japan
 score CANDYHOS		5
 
 # blarson 2005-12-08
+# don 2007-11-21 -- combine other rule; increment score
 body GEOCITIES		/http\:\/\/.*geocities/i
 describe GEOCITIES	geocities url
-score GEOCITIES		1.6
+score GEOCITIES		2.5
 
 # blarson 2005-12-24
 body EMPTYURL		/\bhttp:\/\/(?:www\.)?$/i
@@ -168,7 +169,7 @@ tflags	URIBL_CNKR	net
 score URIBL_CNKR	2.5
 
 # blarson 2007-09-14
-uridnsbl_skip_domain	debian.org debian.net
+uridnsbl_skip_domain	debian.org debian.net yahoo.com google.com
 
 # blarson 2007-09-14
 uridnsbl        URIBL_SBL       sbl.spamhaus.org.       A
@@ -252,10 +253,6 @@ body MASZON		/mc?a(szon|yvidol|ttk)\.(com|org|net)/i
 describe MASZON		pron spam
 score MASZON		4
 
-# blarson 2007-10-26
-full GEOCITIES		/\bhttp\:\/\/geocities\.com\b/i
-describe GEOCITIES	http://geocities.com/
-score GEOCITIES		1
 
 # blarson 2007-10-27
 body GMAIL		/\@gmail\.com\b/i
@@ -297,12 +294,13 @@ body SPACECOM		/^[\w\d]+\s\.\scom\b/
 describe SPACECOM	whatever . com
 score SPACECOM		3
 
+# don -- flowgoaway.com doesn't appear to be a working RBL anymore (if it ever was?)
 # blarson 2007-11-20
-uridnsbl URIBL_FLO	flogoaway.com.	A
-body	URIBL_FLO	eval:check_uridnsbl('URIBL_FLO')
-describe URIBL_FLO	web sit in flogoaway.com
-tflags	URIBL_FLO	net
-score URIBL_FLO		1
+# uridnsbl URIBL_FLO	flowgoaway.com.	A
+# body	URIBL_FLO	eval:check_uridnsbl('URIBL_FLO')
+# describe URIBL_FLO	web site in flowgoaway.com
+# tflags	URIBL_FLO	net
+# score URIBL_FLO		1
 
 # blarson 2007-11-20
 body SOFTROU		/\bwww\.softrou\.com\b/i