ferm: change ferm.conf to a template

[dsa-puppet.git] / modules / postfix / manifests / init.pp

diff --git a/modules/postfix/manifests/init.pp b/modules/postfix/manifests/init.pp
index 0d10b4e883839aa35e8944750ccd8678f43f178d..6ac79cbb918f679c0697e0965527871f4b45f8ea 100644 (file)
--- 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)'