Add chroot parameter (#170) (93ec96b9) · Commits · Projets publics / puppet-postfix

README.md

+5 −0

Original line number	Diff line number	Diff line
		@@ -160,6 +160,11 @@ A string to define the e-mail address to which all mail directed to root should
		Default: 'nobody'.
		Example: 'root_catch@example.com'.

		##### `chroot`
		A boolean to define if postfix should be run in a chroot jail or not. If not defined, '-' is used (OS dependant)
		Default: Undefined.
		Example: true

		##### `satellite`
		A Boolean to define whether to configure postfix as a satellite relay host. This setting is mutually exclusive with the mta Boolean.
		Default: False.

manifests/files.pp

+11 −4

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@ class postfix::files {
		$myorigin = $postfix::myorigin
		$manage_root_alias = $postfix::manage_root_alias
		$root_mail_recipient = $postfix::root_mail_recipient
		$chroot = $postfix::chroot
		$smtp_listen = $postfix::_smtp_listen
		$use_amavisd = $postfix::use_amavisd
		$use_dovecot_lda = $postfix::use_dovecot_lda
		@@ -24,6 +25,12 @@ class postfix::files {
		assert_type(Optional[String], $master_smtp)
		assert_type(Optional[String], $master_smtps)

		$jail = $chroot ? {
		undef => '-',
		true => 'y',
		default => 'n',
		}

		File {
		replace => $manage_conffiles,
		}
		@@ -89,7 +96,7 @@ class postfix::files {
		'myorigin': value => $myorigin;
		}

		case $::osfamily {
		case $facts['os']['family'] {
		'RedHat': {
		::postfix::config {
		'mailq_path': value => '/usr/bin/mailq.postfix';

manifests/init.pp

+3 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,8 @@
		#
		# [root_mail_recipient] - (string)
		#
		# [chroot] - (undef/boolean) Whether postfix should be run in a chroot
		#
		# [satellite] - (boolean) Whether to use as a satellite
		# (implies MTA)
		#
		@@ -97,6 +99,7 @@ class postfix (
		Optional[String] $relayhost = undef, # postfix_relayhost
		Boolean $manage_root_alias = true,
		Variant[Array[String], String] $root_mail_recipient = 'nobody', # root_mail_recipient
		Optional[Boolean] $chroot = undef,
		Boolean $satellite = false,
		String $smtp_listen = '127.0.0.1', # postfix_smtp_listen
		Boolean $use_amavisd = false, # postfix_use_amavisd

spec/acceptance/postfix_spec.rb

+3 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,9 @@ describe 'postfix class' do
		}
		}

		class { 'postfix': }
		class { 'postfix':
		smtp_listen => 'all',
		}
		EOS

		# Run it twice and test for idempotency

templates/master.cf.SLES11.2.erb

+18 −18

Original line number	Diff line number	Diff line
		@@ -10,9 +10,9 @@
		# (yes) (yes) (yes) (never) (100)
		# ==========================================================================
		<% if @smtp_listen == 'all' -%>
		smtp inet n - n - - smtpd
		smtp inet n - <%= @jail %> - - smtpd
		<% else -%>
		<%= @smtp_listen %>:smtp inet n - n - - smtpd
		<%= @smtp_listen %>:smtp inet n - <%= @jail %> - - smtpd
		<% end -%>
		#smtp inet n - n - - smtpd
		#submission inet n - n - - smtpd
		@@ -24,32 +24,32 @@ smtp 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 - n 60 1 pickup
		cleanup unix n - n - 0 cleanup
		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 - - 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
		rewrite unix - - <%= @jail %> - - trivial-rewrite
		bounce unix - - <%= @jail %> - 0 bounce
		defer unix - - <%= @jail %> - 0 bounce
		trace unix - - <%= @jail %> - 0 bounce
		verify unix - - <%= @jail %> - 1 verify
		flush unix n - <%= @jail %> 1000? 0 flush
		proxymap unix - - n - - proxymap
		smtp unix - - n - - smtp
		smtp unix - - <%= @jail %> - - smtp
		# When relaying mail as backup MX, disable fallback_relay to avoid MX loops
		relay unix - - n - - smtp
		relay unix - - <%= @jail %> - - smtp
		-o fallback_relay=
		# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
		showq unix n - n - - showq
		error unix - - n - - error
		discard unix - - n - - discard
		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 - - n - - lmtp
		anvil unix - - n - 1 anvil
		lmtp unix - - <%= @jail %> - - lmtp
		anvil unix - - <%= @jail %> - 1 anvil
		#localhost:10025 inet n - n - - smtpd -o content_filter=
		scache unix - - n - 1 scache
		scache unix - - <%= @jail %> - 1 scache
		#
		# ====================================================================
		# Interfaces to non-Postfix software. Be sure to examine the manual