X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fpostfix%2Fmanifests%2Finit.pp;h=88591a94d5738fe89c1221975e1e14e5690a2da4;hb=3c9536406517ab5f0a46172e323b199acff2c61c;hp=0d10b4e883839aa35e8944750ccd8678f43f178d;hpb=961d1e1e3be93623ae35887645724406fb44fab8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/postfix/manifests/init.pp b/modules/postfix/manifests/init.pp
index 0d10b4e88..88591a94d 100644
--- a/modules/postfix/manifests/init.pp
+++ b/modules/postfix/manifests/init.pp
@@ -1,17 +1,43 @@
-class postfix {
-	munin::check { 'ps_exim4':       ensure => absent }
-	munin::check { 'exim_mailqueue': ensure => absent }
-	munin::check { 'exim_mailstats': ensure => absent }
+class postfix(
+  Boolean $manage_maincf = true,
+) {
+  package { 'postfix':
+    ensure => installed
+  }
 
-	munin::check { 'postfix_mailqueue': }
-	munin::check { 'postfix_mailstats': }
-	munin::check { 'postfix_mailvolume': }
-	munin::check { 'ps_smtp': script => 'ps_' }
-	munin::check { 'ps_smtpd': script => 'ps_' }
+  service { 'postfix':
+    ensure => running
+  }
 
-	@ferm::rule {
-		domain      => '(ip ip6)',
-		description => 'Allow smtp access',
-		rule        => '&SERVICE(tcp, 25)'
-	}
+  include debian_org::mail_incoming_port
+
+  munin::check { 'ps_exim4':       ensure => absent }
+  munin::check { 'exim_mailqueue': ensure => absent }
+  munin::check { 'exim_mailstats': ensure => absent }
+
+  munin::check { 'postfix_mailqueue': }
+  munin::check { 'postfix_mailstats': }
+  munin::check { 'postfix_mailvolume': }
+  munin::check { 'ps_smtp': script => 'ps_' }
+  munin::check { 'ps_smtpd': script => 'ps_' }
+
+  if $manage_maincf {
+    concat { '/etc/postfix/main.cf':
+      notify  => Exec['service postfix reload'],
+    }
+    concat::fragment { 'puppet-postfix-main.cf--header':
+      target  => '/etc/postfix/main.cf',
+      order   => '000',
+      content => template('postfix/main.cf-header.erb')
+    }
+  } else {
+    include fail2ban::postfix
+  }
+
+  exec { 'service postfix reload':
+    path        => '/usr/bin:/usr/sbin:/bin:/sbin',
+    command     => 'service postfix reload',
+    refreshonly => true,
+    require     =>  Package['postfix'],
+  }
 }