summaryrefslogtreecommitdiff
path: root/spamassassin
diff options
context:
space:
mode:
authorroot <root@jones.dk>2016-10-25 17:32:48 +0200
committerroot <root@jones.dk>2016-10-25 17:32:48 +0200
commit63a7e8feb93022f329b910f74be64d68db04a107 (patch)
tree80576b6928dc90d0c9eae5104a0a7000117febcb /spamassassin
parent83813564669cdc6e162615f045615e41aec73553 (diff)
Set (sample) internal_networks trusted_networks.
Diffstat (limited to 'spamassassin')
-rw-r--r--spamassassin/local.cf3
-rw-r--r--spamassassin/local.cf.diff16
2 files changed, 14 insertions, 5 deletions
diff --git a/spamassassin/local.cf b/spamassassin/local.cf
index ba6e8a3..18d725d 100644
--- a/spamassassin/local.cf
+++ b/spamassassin/local.cf
@@ -21,7 +21,8 @@ report_safe 0
# Set which networks or hosts are considered 'trusted' by your mail
# server (i.e. not spammers)
#
-# trusted_networks 212.17.35.
+internal_networks 188.183.5.254/32 127.0.0.1
+trusted_networks 80.68.88.141/32 217.197.91.142 94.18.231.208/29 146.185.137.224
# Set file-locking method (flock is not safe over NFS, but is faster)
diff --git a/spamassassin/local.cf.diff b/spamassassin/local.cf.diff
index 0fd8107..4de4c24 100644
--- a/spamassassin/local.cf.diff
+++ b/spamassassin/local.cf.diff
@@ -1,6 +1,6 @@
--- local.cf.orig 2016-10-24 21:29:10.000000000 +0200
-+++ local.cf 2016-10-25 14:40:00.000000000 +0200
-@@ -15,7 +15,7 @@
++++ local.cf 2016-10-25 16:39:01.000000000 +0200
+@@ -15,13 +15,14 @@
# Save spam messages as a message/rfc822 MIME attachment instead of
# modifying the original message (0: off, 2: use text/plain instead)
#
@@ -9,7 +9,15 @@
# Set which networks or hosts are considered 'trusted' by your mail
-@@ -55,7 +55,7 @@
+ # server (i.e. not spammers)
+ #
+-# trusted_networks 212.17.35.
++internal_networks 188.183.5.254/32 127.0.0.1
++trusted_networks 80.68.88.141/32 217.197.91.142 94.18.231.208/29 146.185.137.224
+
+
+ # Set file-locking method (flock is not safe over NFS, but is faster)
+@@ -55,7 +56,7 @@
# Whether to decode non- UTF-8 and non-ASCII textual parts and recode
# them to UTF-8 before the text is given over to rules processing.
#
@@ -18,7 +26,7 @@
# Some shortcircuiting, if the plugin is enabled
#
-@@ -87,3 +87,12 @@
+@@ -87,3 +88,12 @@
# shortcircuit BAYES_00 ham
endif # Mail::SpamAssassin::Plugin::Shortcircuit