how bad can this go

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

diff --git a/modules/ferm/files/defs.conf b/modules/ferm/files/defs.conf
new file mode 100644 (file)
index 0000000..329d7ed
--- /dev/null
+++ b/modules/ferm/files/defs.conf
@@ -0,0 +1,28 @@
+@def &SERVICE($proto, $port) = {
+ domain (ip ip6) chain INPUT proto $proto dport $port ACCEPT;
+}
+
+@def &V4_SERVICE($proto, $port) = {
+ domain ip chain INPUT proto $proto dport $port ACCEPT;
+}
+
+@def &V6_SERVICE($proto, $port) = {
+ domain ip6 chain INPUT proto $proto dport $port ACCEPT;
+}
+
+@def &V4_SERVICE_RANGE($proto, $port, $srange) = {
+ domain ip chain INPUT proto $proto dport $port saddr $srange ACCEPT;
+}
+
+@def &V6_SERVICE_RANGE($proto, $port, $srange) = {
+ domain ip6 chain INPUT proto $proto dport $port saddr $srange ACCEPT;
+}
+
+@def $HOST_MUNIN  = (192.25.206.57 192.25.206.33);
+@def $HOST_NAGIOS = (192.25.206.57 192.25.206.33);
+
+@def $sgran  = (91.103.132.25 2001:4b10:100b::dead:f00d);
+@def $weasel = ();
+@def $zobel  = ();
+@def $luca   = ();
+@def $DSA_IPS = ($sgran $weasel $zobel $luca);

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index ee9ce77..5bedd6c 100644 (file)
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -27,11 +27,15 @@ class ferm {
                         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; }"
+                rule            => "domain (ip ip6) proto tcp mod state state (NEW) dport (ssh) @subchain 'ssh' { saddr (\$SSH_SOURCES) ACCEPT; }"
         }
 
         exec { "ferm restart":

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 085704b..4c12bd5 100644 (file)
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -9,11 +9,11 @@
 sshallowed = []
 
 case hostname
-  when 'logtest01' then sshallowed << [ '91.103.132.25', '91.103.132.49' ]
+  when 'logtest01' then sshallowed << [ '$DSA_IPS' ]
 end
 
 if sshallowed.length == 0
-  sshallowed << '0.0.0.0'
+  sshallowed = [ '0.0.0.0' ]
 end
 
 sshallowed.join(' ')