what can possibly go wrong

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/manifests/site.pp b/manifests/site.pp
index 1c719fe..fb85a46 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -21,6 +21,7 @@ node default {
 
     $mxinfo   = allnodeinfo("mXRecord")
 
+    include ferm
     include munin-node
     include sudo
     include ssh
@@ -80,7 +81,7 @@ node default {
     }
 
     case $hostname {
-        logtest01: { include ferm }
+        logtest01: { include ferm::real }
     }
     case $hostname {
         geo1,geo2,geo3: { include named::geodns }

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 55f619e..c07449f 100644 (file)
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -10,49 +10,16 @@ class ferm {
                }
        }
 
-        package { ferm: ensure => installed }
-
         file { 
+                "/etc/ferm": 
+                        ensure => directory;
                 "/etc/ferm/dsa.d": 
-                        ensure => directory,
-                        require => Package["ferm"];
-                "/etc/ferm/conf.d": 
-                        ensure => directory,
-                        require => Package["ferm"];
-                "/etc/ferm/ferm.conf":
-                        source  => "puppet:///ferm/ferm.conf",
-                        require => Package["ferm"],
-                        notify  => Exec["ferm restart"];
-                "/etc/ferm/conf.d/me.conf":
-                        content => template("ferm/me.conf.erb"),
-                        require => Package["ferm"],
-                        notify  => Exec["ferm restart"];
-                "/etc/ferm/conf.d/defs.conf":
-                        source  => "puppet:///ferm/defs.conf",
-                        require => Package["ferm"],
-                        notify  => Exec["ferm restart"];
-        }
-
-        ferm::rule { "dsa-ssh":
-                description     => "Allow SSH from DSA",
-                rule            => "proto tcp mod state state (NEW) dport (ssh) @subchain 'ssh' { saddr (\$SSH_SOURCES) ACCEPT; }"
-        }
-        ferm::rule { "dsa-ssh-v6":
-                description     => "Allow SSH from DSA",
-                domain          => "ip6",
-                rule            => "proto tcp mod state state (NEW) dport (ssh) @subchain 'ssh' { saddr (\$SSH_V6_SOURCES) ACCEPT; }"
-        }
-        ferm::rule { "dsa-munin":
-                description     => "Allow munin from munin master",
-                rule            => "proto tcp mod state state (NEW) dport (munin) @subchain 'munin' { saddr (\$HOST_MUNIN) ACCEPT; }"
-        }
-        ferm::rule { "dsa-nagios":
-                description     => "Allow nrpe from nagios master",
-                rule            => "proto tcp mod state state (NEW) dport (5666) @subchain 'nagios' { saddr (\$HOST_NAGIOS) ACCEPT; }"
+                        ensure => directory;
         }
 
         exec { "ferm restart":
-                path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+                command     => "/bin/true",
                 refreshonly => true,
         }
+
 }

diff --git a/modules/ferm/manifests/real.pp b/modules/ferm/manifests/real.pp
new file mode 100644 (file)
index 0000000..6ad7bcc
--- /dev/null
+++ b/modules/ferm/manifests/real.pp
@@ -0,0 +1,45 @@
+class ferm::real {
+
+        package { ferm: ensure => installed }
+
+        file { 
+                "/etc/ferm/conf.d": 
+                        ensure => directory,
+                        require => Package["ferm"];
+                "/etc/ferm/ferm.conf":
+                        source  => "puppet:///ferm/ferm.conf",
+                        require => Package["ferm"],
+                        notify  => Exec["ferm restart"];
+                "/etc/ferm/conf.d/me.conf":
+                        content => template("ferm/me.conf.erb"),
+                        require => Package["ferm"],
+                        notify  => Exec["ferm restart"];
+                "/etc/ferm/conf.d/defs.conf":
+                        source  => "puppet:///ferm/defs.conf",
+                        require => Package["ferm"],
+                        notify  => Exec["ferm restart"];
+        }
+
+        ferm::rule { "dsa-ssh":
+                description     => "Allow SSH from DSA",
+                rule            => "proto tcp mod state state (NEW) dport (ssh) @subchain 'ssh' { saddr (\$SSH_SOURCES) ACCEPT; }"
+        }
+        ferm::rule { "dsa-ssh-v6":
+                description     => "Allow SSH from DSA",
+                domain          => "ip6",
+                rule            => "proto tcp mod state state (NEW) dport (ssh) @subchain 'ssh' { saddr (\$SSH_V6_SOURCES) ACCEPT; }"
+        }
+        ferm::rule { "dsa-munin":
+                description     => "Allow munin from munin master",
+                rule            => "proto tcp mod state state (NEW) dport (munin) @subchain 'munin' { saddr (\$HOST_MUNIN) ACCEPT; }"
+        }
+        ferm::rule { "dsa-nagios":
+                description     => "Allow nrpe from nagios master",
+                rule            => "proto tcp mod state state (NEW) dport (5666) @subchain 'nagios' { saddr (\$HOST_NAGIOS) ACCEPT; }"
+        }
+
+        exec { "ferm restart":
+                path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+                refreshonly => true,
+        }
+}