X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=84fc808d735283d09b5b004793c54243881a98cf;hb=c46d1f99d0294179797fb90e3b9fc5b44780bde5;hp=a083892b699dd3729c06952caf7d3e54e3eab9c9;hpb=af4236ba650f0ae9564a8fbf5831f27e9c7ad8f8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index a083892b6..84fc808d7 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -37,20 +37,17 @@ class ferm {
                         mode    => 0400,
                         notify  => Exec["ferm restart"];
                 "/etc/ferm/conf.d/defs.conf":
-                        source  => "puppet:///ferm/defs.conf",
+                        content => template("ferm/defs.conf.erb"),
+                        require => Package["ferm"],
+                        mode    => 0400,
+                        notify  => Exec["ferm restart"];
+                "/etc/ferm/conf.d/interfaces.conf":
+                        content => template("ferm/interfaces.conf.erb"),
                         require => Package["ferm"],
                         mode    => 0400,
                         notify  => Exec["ferm restart"];
         }
 
-        ferm::rule { "dsa-drop":
-                domain          => "(ip ip6)",
-                description     => "Drop everything else",
-                prio            => "99",
-                rule            => "jump log_or_drop"
-        }
-
-
         exec { "ferm restart":
                 command     => "/etc/init.d/ferm restart",
                 refreshonly => true,