From 9fb504abd4415b48ae0eae94cece031ebcd48abb Mon Sep 17 00:00:00 2001 From: David Carlos Date: Tue, 12 Jan 2016 17:34:57 -0200 Subject: [PATCH] Defines variable to write mailman's emails in file. --- config/dev/config.yaml | 1 + cookbooks/mailman/files/centos/master.cf | 5 +++++ cookbooks/mailman/files/centos/master.cf.development | 129 --------------------------------------------------------------------------------------------------------------------------------- cookbooks/mailman/recipes/default.rb | 16 ++++++++-------- 4 files changed, 14 insertions(+), 137 deletions(-) delete mode 100644 cookbooks/mailman/files/centos/master.cf.development diff --git a/config/dev/config.yaml b/config/dev/config.yaml index 5e7924e..215da4b 100644 --- a/config/dev/config.yaml +++ b/config/dev/config.yaml @@ -20,3 +20,4 @@ external_outgoing_mail_domain: serpro.gov.br raven_dsn: https://a5e2f92a83774dfc9de66486e0fe970b:1a9229a4e1d2483582144d302fb53115@sentry.tracy.com.br/19 google_analytics_id: 'UA-64206731-2' dev_backup_frequency: true +disable_send_emails: true diff --git a/cookbooks/mailman/files/centos/master.cf b/cookbooks/mailman/files/centos/master.cf index 2087147..77ba110 100644 --- a/cookbooks/mailman/files/centos/master.cf +++ b/cookbooks/mailman/files/centos/master.cf @@ -126,3 +126,8 @@ scache unix - - n - 1 scache mailman unix - n n - - pipe flags=FR user=mailman:mailman argv=/usr/lib/mailman/bin/postfix-to-mailman.py ${nexthop} ${user} + +fs_mail unix - n n - - pipe + flags=F user=spb argv=tee --append /var/tmp/fs_mail.dump + + diff --git a/cookbooks/mailman/files/centos/master.cf.development b/cookbooks/mailman/files/centos/master.cf.development deleted file mode 100644 index 66efd33..0000000 --- a/cookbooks/mailman/files/centos/master.cf.development +++ /dev/null @@ -1,129 +0,0 @@ -# MANAGED WITH CHEF; DO NOT CHANGE BY HAND -# -# Postfix master process configuration file. For details on the format -# of the file, see the master(5) manual page (command: "man 5 master"). -# -# Do not forget to execute "postfix reload" after editing this file. -# -# ========================================================================== -# service type private unpriv chroot wakeup maxproc command + args -# (yes) (yes) (yes) (never) (100) -# ========================================================================== -smtp inet n - n - - smtpd -#smtp inet n - n - 1 postscreen -#smtpd pass - - n - - smtpd -#dnsblog unix - - n - 0 dnsblog -#tlsproxy unix - - n - 0 tlsproxy -#submission inet n - n - - smtpd -# -o syslog_name=postfix/submission -# -o smtpd_tls_security_level=encrypt -# -o smtpd_sasl_auth_enable=yes -# -o smtpd_reject_unlisted_recipient=no -# -o smtpd_client_restrictions=$mua_client_restrictions -# -o smtpd_helo_restrictions=$mua_helo_restrictions -# -o smtpd_sender_restrictions=$mua_sender_restrictions -# -o smtpd_recipient_restrictions=permit_sasl_authenticated,reject -# -o milter_macro_daemon_name=ORIGINATING -#smtps inet n - n - - smtpd -# -o syslog_name=postfix/smtps -# -o smtpd_tls_wrappermode=yes -# -o smtpd_sasl_auth_enable=yes -# -o smtpd_reject_unlisted_recipient=no -# -o smtpd_client_restrictions=$mua_client_restrictions -# -o smtpd_helo_restrictions=$mua_helo_restrictions -# -o smtpd_sender_restrictions=$mua_sender_restrictions -# -o smtpd_recipient_restrictions=permit_sasl_authenticated,reject -# -o milter_macro_daemon_name=ORIGINATING -#628 inet n - n - - qmqpd -pickup unix n - n 60 1 pickup -cleanup unix n - n - 0 cleanup -qmgr unix n - n 300 1 qmgr -#qmgr unix n - n 300 1 oqmgr -tlsmgr unix - - n 1000? 1 tlsmgr -rewrite unix - - n - - trivial-rewrite -bounce unix - - n - 0 bounce -defer unix - - n - 0 bounce -trace unix - - n - 0 bounce -verify unix - - n - 1 verify -flush unix n - n 1000? 0 flush -proxymap unix - - n - - proxymap -proxywrite unix - - n - 1 proxymap -smtp unix - - n - - smtp -relay unix - - n - - smtp -# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5 -showq unix n - n - - showq -error unix - - n - - error -retry unix - - n - - error -discard unix - - n - - discard -local unix - n n - - local -virtual unix - n n - - virtual -lmtp unix - - n - - lmtp -anvil unix - - n - 1 anvil -scache unix - - n - 1 scache -# -# ==================================================================== -# Interfaces to non-Postfix software. Be sure to examine the manual -# pages of the non-Postfix software to find out what options it wants. -# -# Many of the following services use the Postfix pipe(8) delivery -# agent. See the pipe(8) man page for information about ${recipient} -# and other message envelope options. -# ==================================================================== -# -# maildrop. See the Postfix MAILDROP_README file for details. -# Also specify in main.cf: maildrop_destination_recipient_limit=1 -# -#maildrop unix - n n - - pipe -# flags=DRhu user=vmail argv=/usr/local/bin/maildrop -d ${recipient} -# -# ==================================================================== -# -# Recent Cyrus versions can use the existing "lmtp" master.cf entry. -# -# Specify in cyrus.conf: -# lmtp cmd="lmtpd -a" listen="localhost:lmtp" proto=tcp4 -# -# Specify in main.cf one or more of the following: -# mailbox_transport = lmtp:inet:localhost -# virtual_transport = lmtp:inet:localhost -# -# ==================================================================== -# -# Cyrus 2.1.5 (Amos Gouaux) -# Also specify in main.cf: cyrus_destination_recipient_limit=1 -# -#cyrus unix - n n - - pipe -# user=cyrus argv=/usr/lib/cyrus-imapd/deliver -e -r ${sender} -m ${extension} ${user} -# -# ==================================================================== -# -# Old example of delivery via Cyrus. -# -#old-cyrus unix - n n - - pipe -# flags=R user=cyrus argv=/usr/lib/cyrus-imapd/deliver -e -m ${extension} ${user} -# -# ==================================================================== -# -# See the Postfix UUCP_README file for configuration details. -# -#uucp unix - n n - - pipe -# flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient) -# -# ==================================================================== -# -# Other external delivery methods. -# -#ifmail unix - n n - - pipe -# flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient) -# -#bsmtp unix - n n - - pipe -# flags=Fq. user=bsmtp argv=/usr/local/sbin/bsmtp -f $sender $nexthop $recipient -# -#scalemail-backend unix - n n - 2 pipe -# flags=R user=scalemail argv=/usr/lib/scalemail/bin/scalemail-store -# ${nexthop} ${user} ${extension} -# - -fs_mail unix - n n - - pipe - flags=F user=spb argv=tee --append /var/tmp/fs_mail.dump - diff --git a/cookbooks/mailman/recipes/default.rb b/cookbooks/mailman/recipes/default.rb index 2ee33d3..606c459 100644 --- a/cookbooks/mailman/recipes/default.rb +++ b/cookbooks/mailman/recipes/default.rb @@ -83,18 +83,18 @@ cookbook_file '/etc/cron.d/mailman-spb' do mode 0644 end -execute 'postfix:disable-email-prod' do +execute 'postfix:disable-send-emails' do command "postconf 'default_transport = fs_mail'" - not_if "cat /etc/postfix/main.cf | grep 'default_transport = fs_mail'" - action :nothing + only_if "#{node['config']['disable_send_emails']}" +end + +execute 'postfix:enable-send-emails' do + command "postconf 'default_transport = smtp'" + not_if "#{node['config']['disable_send_emails']}" end cookbook_file '/etc/postfix/master.cf' do - unless node['environment'] == "prod" - source 'master.cf.development' - notifies :run, 'execute[postfix:disable-email-prod]' - end - notifies :restart, 'service[postfix]' + notifies :reload, 'service[postfix]' end execute 'set-mailman-default-list' do -- libgit2 0.21.2