From a5ddb403c883263d5d88eab742dd76ec3ac03709 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Sat, 22 Aug 2015 12:15:36 +0200 Subject: [PATCH] Remove policyd SPF management until it is better managed --- postfix/files/main.cf | 3 +-- postfix/files/master.cf | 3 --- postfix/map.jinja | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/postfix/files/main.cf b/postfix/files/main.cf index 901f1f6..2f7bf48 100644 --- a/postfix/files/main.cf +++ b/postfix/files/main.cf @@ -50,8 +50,7 @@ {{ set_parameter('recipient_delimiter', '+') }} {{ set_parameter('inet_interfaces', 'all') }} {{ set_parameter('message_size_limit', '41943040') }} -{{ set_parameter('policyd-spf_time_limit', '3600s') }} -{{ set_parameter('smtpd_relay_restrictions', 'permit_mynetworks permit_sasl_authenticated defer_unauth_destination check_policy_service unix:private/policyd-spf') }} +{{ set_parameter('smtpd_relay_restrictions', 'permit_mynetworks permit_sasl_authenticated defer_unauth_destination') }} {% if 'virtual' in pillar.get('postfix','') %} diff --git a/postfix/files/master.cf b/postfix/files/master.cf index 6456810..242a939 100644 --- a/postfix/files/master.cf +++ b/postfix/files/master.cf @@ -124,6 +124,3 @@ scalemail-backend unix - n n - 2 pipe mailman unix - n n - - pipe flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py ${nexthop} ${user} - -policyd-spf unix - n n - 0 spawn - user=nobody argv=/usr/bin/policyd-spf /etc/postfix-policyd-spf-python/policyd-spf.conf diff --git a/postfix/map.jinja b/postfix/map.jinja index 999e08d..ab20dfc 100644 --- a/postfix/map.jinja +++ b/postfix/map.jinja @@ -1,6 +1,6 @@ {% set postfix = salt['grains.filter_by']({ 'Debian': { - 'packages': ['postfix', 'postfix-policyd-spf-python'], + 'packages': ['postfix'], 'postgrey_pkg': 'postgrey', 'service': 'postfix', 'aliases': '/etc/aliases',