more ordering

[mirror/dsa-puppet.git] / modules / ferm / manifests / per-host.pp

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 65b056d..5f17526 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -3,10 +3,6 @@ class ferm::per-host {
                include ferm::zivit
        }
 
-       if $::hostname in [chopin,franck,gluck,kassia,klecker,lobos,morricone,ravel,ries,rietz,saens,schein,santoro,steffani,valente,villa,wieck,stabile,bizet] {
-               include ferm::ftp
-       }
-
        case $::hostname {
                piatti,samosa: {
                        @ferm::rule { 'dsa-udd-stunnel':
@@ -91,13 +87,6 @@ class ferm::per-host {
                                rule            => '&SERVICE(tcp, 6523)'
                        }
                }
-               bendel,liszt: {
-                       @ferm::rule { 'smtp':
-                               domain          => '(ip ip6)',
-                               description     => 'Allow smtp access',
-                               rule            => '&SERVICE(tcp, 25)'
-                       }
-               }
                draghi: {
                        #@ferm::rule { 'dsa-bind':
                        #    domain          => '(ip ip6)',
@@ -121,12 +110,9 @@ class ferm::per-host {
                        }
                }
                cilea: {
-                       file {
-                               '/etc/ferm/conf.d/load_sip_conntrack.conf':
-                                       source => 'puppet:///modules/ferm/conntrack_sip.conf',
-                                       require => Package['ferm'],
-                                       notify  => Service['ferm'],
-                       }
+                       ferm::module { 'nf_conntrack_sip': }
+                       ferm::module { 'nf_conntrack_h323': }
+
                        @ferm::rule { 'dsa-sip':
                                domain          => '(ip ip6)',
                                description     => 'Allow sip access',