Skip to content

remove postgrey from mail stack #1364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

remove postgrey from mail stack #1364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions modules/ocf_mail/files/spam/postgrey/postgrey
View file
Open in desktop

This file was deleted.

9 changes: 1 addition & 8 deletions modules/ocf_mail/manifests/spam.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
# - milter configuration
# - clamav virus scanning
# - spamassassin
# - postgrey (graylisting)
# - policyd-weight (DNSBLs and more)
# - basic metadata logging to /var/log/ocfmail.log
#
Expand All @@ -14,7 +13,7 @@
# badness filtering common to all site configurations

package {
['clamav-milter', 'spamassassin', 'spamass-milter', 'postgrey',
['clamav-milter', 'spamassassin', 'spamass-milter',
'policyd-weight']:;
}

Expand All @@ -26,8 +25,6 @@
require => Package['spamass-milter'];
'clamav-milter':
require => Package['clamav-milter'];
'postgrey':
require => Package['postgrey'];
'policyd-weight':
require => Package['policyd-weight'];
}
Expand Down Expand Up @@ -78,10 +75,6 @@
source => 'puppet:///modules/ocf_mail/spam/clamav/clamav-milter.conf',
notify => Service['clamav-milter'],
require => Package['clamav-milter'];
'/etc/default/postgrey':
source => 'puppet:///modules/ocf_mail/spam/postgrey/postgrey',
notify => Service['postgrey'],
require => Package['postgrey'];
'/etc/policyd-weight.conf':
source => 'puppet:///modules/ocf_mail/spam/policyd-weight/policyd-weight.conf',
notify => Service['policyd-weight'],
Expand Down
3 changes: 1 addition & 2 deletions modules/ocf_mail/templates/postfix/main.cf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,12 @@ recipient_delimiter = +
propagate_unmatched_extensions = canonical

# client restrictions for SMTP connections
# skip OCF, reject if no reverse DNS, greylist if not whitelisted
# skip OCF, reject if no reverse DNS
smtpd_client_restrictions =
permit_mynetworks,
permit_sasl_authenticated,
reject_unknown_client_hostname,
permit_dnswl_client list.dnswl.org,
check_policy_service inet:127.0.0.1:10023,
sleep 5,
permit,

Expand Down