diff options
| author | root <root@jones.dk> | 2016-10-25 18:14:08 +0200 |
|---|---|---|
| committer | root <root@jones.dk> | 2016-10-25 18:14:08 +0200 |
| commit | 53c5e253f85a0ed5d9a5826bfee8b77923fbee65 (patch) | |
| tree | e6627805402368fd292384c47ac61b5fe1779cc2 /spamassassin/tweak.d | |
| parent | 61e901ad9797ea2d15ec9892fea84e26d6a26aab (diff) | |
Fix include internal_networks in trusted_networks.
Diffstat (limited to 'spamassassin/tweak.d')
| -rwxr-xr-x | spamassassin/tweak.d/networks.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spamassassin/tweak.d/networks.sh b/spamassassin/tweak.d/networks.sh index 25ac109..7b4d56b 100755 --- a/spamassassin/tweak.d/networks.sh +++ b/spamassassin/tweak.d/networks.sh @@ -38,6 +38,7 @@ addoroverwritewithindents() { "$file" } +ournets="127.0.0.1" REDPILL=$(firstitem "/etc/local-ORG/redpill") redpilldir="/etc/local-$REDPILL/" REALMS="$(items "$redpilldir/realms")" @@ -47,9 +48,8 @@ for realm in $REALMS; do [ -d "$realmdir" ] || continue mailnets=$(items_singleline "$realmdir/mailnetworks") #' if [ "$REALM" = "$realm" ]; then - ournets="${ournets:+$ournets }$mailnets" + ournets="$ournets $mailnets" [ ! -f "$realmdir/localnetworks" ] || ournets="${ournets:+$ournets }$(items "$realmdir/localnetworks")" - ournets="${ournets:+$ournets }127.0.0.1" else redpillnets="${redpillnets:+$redpillnets }$mailnets" fi @@ -57,4 +57,4 @@ done echo "FIXME: Add these to /etc/spamassassin/local.cf:" echo "internal_networks $ournets" -echo "trusted_networks $redpillnets" +echo "trusted_networks $ournets $redpillnets" |