X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpostfix%2Fmanifests%2Finit.pp;h=6ac79cbb918f679c0697e0965527871f4b45f8ea;hb=97c21cd3ff0b45bdb4bdb92e4054231a7e845328;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..6ac79cbb9 100644
--- a/modules/postfix/manifests/init.pp
+++ b/modules/postfix/manifests/init.pp
@@ -1,4 +1,13 @@
 class postfix {
+
+	package { 'postfix':
+		ensure => installed
+	}
+
+	service { 'postfix':
+		ensure => running
+	}
+
 	munin::check { 'ps_exim4':       ensure => absent }
 	munin::check { 'exim_mailqueue': ensure => absent }
 	munin::check { 'exim_mailstats': ensure => absent }
@@ -9,7 +18,7 @@ class postfix {
 	munin::check { 'ps_smtp': script => 'ps_' }
 	munin::check { 'ps_smtpd': script => 'ps_' }
 
-	@ferm::rule {
+	@ferm::rule { 'smtp':
 		domain      => '(ip ip6)',
 		description => 'Allow smtp access',
 		rule        => '&SERVICE(tcp, 25)'