Merge pull request #412 from voxpupuli/maint/drop-sles-11-12 (e2a589d7) · Commits · Projets publics / Puppet Camptocamp Postfix

data/osfamily/Suse.yaml

deleted100644 → 0

+0 −4

Original line number	Diff line number	Diff line
		---
		postfix::params::restart_cmd: '/usr/bin/systemctl reload postfix'
		postfix::params::master_os_template: "postfix/master.cf.sles.erb"
		...

data/osfamily/Suse/11.yaml

deleted100644 → 0

+0 −4

Original line number	Diff line number	Diff line
		---
		postfix::params::restart_cmd: '/etc/init.d/postfix reload'
		postfix::params::master_os_template: "postfix/master.cf.SLES%{facts.os.release.full}.erb"
		...

templates/master.cf.SLES11.2.erb

deleted100644 → 0

+0 −82

Original line number	Diff line number	Diff line
		#
		### This file is managed by Puppet, all edits will be lost on next Puppet run!
		#
		#
		# Postfix master process configuration file. For details on the format
		# of the file, see the Postfix master(5) manual page.
		#
		# ==========================================================================
		# service type private unpriv chroot wakeup maxproc command + args
		# (yes) (yes) (yes) (never) (100)
		# ==========================================================================
		<% if @smtp_listen == 'all' -%>
		smtp inet n - <%= @jail %> - - smtpd
		<% else -%>
		<%- (@smtp_listen.is_a?(Array) ? @smtp_listen : @smtp_listen.split(' ')).each do \|listen_address\| -%>
		<%= listen_address %>:smtp inet n - <%= @jail %> - - smtpd
		<%- end -%>
		<% end -%>
		#smtp inet n - n - - smtpd
		#submission inet n - n - - smtpd
		# -o smtpd_etrn_restrictions=reject
		# -o smtpd_client_restrictions=permit_sasl_authenticated,reject
		#smtps inet n - n - - smtpd -o smtpd_tls_wrappermode=yes
		# -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes
		#submission inet n - n - - smtpd
		# -o smtpd_etrn_restrictions=reject
		# -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes
		#628 inet n - n - - qmqpd
		pickup fifo n - <%= @jail %> 60 1 pickup
		cleanup unix n - <%= @jail %> - 0 cleanup
		qmgr fifo n - n 300 1 qmgr
		#qmgr fifo n - n 300 1 oqmgr
		#tlsmgr unix - - n 1000? 1 tlsmgr
		rewrite unix - - <%= @jail %> - - trivial-rewrite
		bounce unix - - <%= @jail %> - 0 <%= @master_bounce_command %>
		defer unix - - <%= @jail %> - 0 <%= @master_defer_command %>
		trace unix - - <%= @jail %> - 0 bounce
		verify unix - - <%= @jail %> - 1 verify
		flush unix n - <%= @jail %> 1000? 0 flush
		proxymap unix - - n - - proxymap
		smtp unix - - <%= @jail %> - - smtp
		# When relaying mail as backup MX, disable fallback_relay to avoid MX loops
		relay unix - - <%= @jail %> - - smtp
		-o fallback_relay=
		# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
		showq unix n - <%= @jail %> - - showq
		error unix - - <%= @jail %> - - error
		discard unix - - <%= @jail %> - - discard
		local unix - n n - - local
		virtual unix - n n - - virtual
		lmtp unix - - <%= @jail %> - - lmtp
		anvil unix - - <%= @jail %> - 1 anvil
		#localhost:10025 inet n - n - - smtpd -o content_filter=
		scache unix - - <%= @jail %> - 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}
		cyrus unix - n n - - pipe
		user=cyrus argv=/usr/lib/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
		uucp unix - n n - - pipe
		flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
		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=foo argv=/usr/local/sbin/bsmtp -f $sender $nexthop $recipient
		procmail unix - n n - - pipe
		flags=R user=nobody argv=/usr/bin/procmail -t -m /etc/procmailrc ${sender} ${recipient}
		retry unix - - n - - error
		proxywrite unix - - n - 1 proxymap
		tlsmgr unix - - n 1000? 1 tlsmgr

templates/master.cf.SLES11.3.erb

deleted100644 → 0

+0 −86

Original line number	Diff line number	Diff line
		#
		### This file is managed by Puppet, all edits will be lost on next Puppet run!
		#
		#
		# Postfix master process configuration file. For details on the format
		# of the file, see the Postfix master(5) manual page.
		#
		# ==========================================================================
		# service type private unpriv chroot wakeup maxproc command + args
		# (yes) (yes) (yes) (never) (100)
		# ==========================================================================
		<% if @smtp_listen == 'all' -%>
		smtp inet n - <%= @jail %> - - smtpd
		<% else -%>
		<%- (@smtp_listen.is_a?(Array) ? @smtp_listen : @smtp_listen.split(' ')).each do \|listen_address\| -%>
		<%= listen_address %>:smtp inet n - <%= @jail %> - - smtpd
		<%- end -%>
		<% end -%>
		#smtp inet n - n - - smtpd
		#submission inet n - n - - smtpd
		# -o smtpd_etrn_restrictions=reject
		# -o smtpd_client_restrictions=permit_sasl_authenticated,reject
		#smtps inet n - n - - smtpd -o smtpd_tls_wrappermode=yes
		# -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes
		#submission inet n - n - - smtpd
		# -o smtpd_etrn_restrictions=reject
		# -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes
		#628 inet n - n - - qmqpd
		pickup fifo n - <%= @jail %> 60 1 pickup
		cleanup unix n - <%= @jail %> - 0 cleanup
		qmgr fifo n - n 300 1 qmgr
		#qmgr fifo n - n 300 1 oqmgr
		#tlsmgr unix - - n 1000? 1 tlsmgr
		rewrite unix - - <%= @jail %> - - trivial-rewrite
		bounce unix - - <%= @jail %> - 0 <%= @master_bounce_command %>
		defer unix - - <%= @jail %> - 0 <%= @master_defer_command %>
		trace unix - - <%= @jail %> - 0 bounce
		verify unix - - <%= @jail %> - 1 verify
		flush unix n - <%= @jail %> 1000? 0 flush
		proxymap unix - - n - - proxymap
		smtp unix - - <%= @jail %> - - smtp
		# When relaying mail as backup MX, disable fallback_relay to avoid MX loops
		relay unix - - <%= @jail %> - - smtp
		-o smtp_fallback_relay=
		# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
		showq unix n - <%= @jail %> - - showq
		error unix - - <%= @jail %> - - error
		discard unix - - <%= @jail %> - - discard
		local unix - n n - - local
		virtual unix - n n - - virtual
		lmtp unix - - <%= @jail %> - - lmtp
		anvil unix - - <%= @jail %> - 1 anvil
		#localhost:10025 inet n - n - - smtpd -o content_filter=
		scache unix - - <%= @jail %> - 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}
		cyrus unix - n n - - pipe
		user=cyrus argv=/usr/lib/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
		uucp unix - n n - - pipe
		flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
		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=foo argv=/usr/local/sbin/bsmtp -f $sender $nexthop $recipient
		procmail unix - n n - - pipe
		flags=R user=nobody argv=/usr/bin/procmail -t -m /etc/procmailrc ${sender} ${recipient}
		retry unix - - n - - error
		proxywrite unix - - n - 1 proxymap
		tlsmgr unix - - n 1000? 1 tlsmgr
		#smtp inet n - n - 1 postscreen
		#smtpd pass - - n - - smtpd
		#dnsblog unix - - n - 0 dnsblog
		#tlsproxy unix - - n - 0 tlsproxy

templates/master.cf.SLES11.4.erb

deleted100644 → 0

+0 −84

Original line number	Diff line number	Diff line
		#
		### This file is managed by Puppet, all edits will be lost on next Puppet run!
		#
		#
		# Postfix master process configuration file. For details on the format
		# of the file, see the Postfix master(5) manual page.
		#
		# ==========================================================================
		# service type private unpriv chroot wakeup maxproc command + args
		# (yes) (yes) (yes) (never) (100)
		# ==========================================================================
		<% if @smtp_listen == 'all' -%>
		smtp inet n - <%= @jail %> - - smtpd
		<% else -%>
		<%- (@smtp_listen.is_a?(Array) ? @smtp_listen : @smtp_listen.split(' ')).each do \|listen_address\| -%>
		<%= listen_address %>:smtp inet n - <%= @jail %> - - smtpd
		<%- end -%>
		<% end -%>
		#submission inet n - n - - smtpd
		# -o smtpd_etrn_restrictions=reject
		# -o smtpd_client_restrictions=permit_sasl_authenticated,reject
		#smtps inet n - n - - smtpd
		# -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes
		#submission inet n - n - - smtpd
		# -o smtpd_etrn_restrictions=reject
		# -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes
		#628 inet n - n - - qmqpd
		pickup fifo n - <%= @jail %> 60 1 pickup
		cleanup unix n - <%= @jail %> - 0 cleanup
		qmgr fifo n - n 300 1 qmgr
		#qmgr fifo n - n 300 1 oqmgr
		tlsmgr unix - - <%= @jail %> 1000? 1 tlsmgr
		rewrite unix - - <%= @jail %> - - trivial-rewrite
		bounce unix - - <%= @jail %> - 0 <%= @master_bounce_command %>
		defer unix - - <%= @jail %> - 0 <%= @master_defer_command %>
		trace unix - - <%= @jail %> - 0 bounce
		verify unix - - <%= @jail %> - 1 verify
		flush unix n - <%= @jail %> 1000? 0 flush
		proxymap unix - - n - - proxymap
		smtp unix - - <%= @jail %> - - smtp
		# When relaying mail as backup MX, disable smtp_fallback_relay to avoid MX loops
		relay unix - - <%= @jail %> - - smtp
		-o smtp_fallback_relay=
		# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
		showq unix n - <%= @jail %> - - showq
		error unix - - <%= @jail %> - - error
		discard unix - - <%= @jail %> - - discard
		local unix - n n - - local
		virtual unix - n n - - virtual
		lmtp unix - - <%= @jail %> - - lmtp
		anvil unix - - <%= @jail %> - 1 anvil
		#localhost:10025 inet n - n - - smtpd -o content_filter=
		scache unix - - <%= @jail %> - 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}
		cyrus unix - n n - - pipe
		user=cyrus argv=/usr/lib/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
		uucp unix - n n - - pipe
		flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
		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=foo argv=/usr/local/sbin/bsmtp -f $sender $nexthop $recipient
		procmail unix - n n - - pipe
		flags=R user=nobody argv=/usr/bin/procmail -t -m /etc/procmailrc ${sender} ${recipient}
		retry unix - - n - - error
		proxywrite unix - - n - 1 proxymap
		#smtp inet n - n - 1 postscreen
		#smtpd pass - - n - - smtpd
		#dnsblog unix - - n - 0 dnsblog
		#tlsproxy unix - - n - 0 tlsproxy