let's see if this works

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

diff --git a/modules/ferm/files/ferm.conf b/modules/ferm/files/ferm.conf
new file mode 100644 (file)
index 0000000..e001d65
--- /dev/null
+++ b/modules/ferm/files/ferm.conf
@@ -0,0 +1,18 @@
+# -*- shell-script -*-
+#
+#  Configuration file for ferm(1).
+#
+
+include "conf.d/me.conf";
+
+domain (ip ip6) {
+       chain INPUT {
+               policy DROP;
+               mod state state (ESTABLISHED RELATED) ACCEPT;
+               interface lo ACCEPT;
+               mod state state (INVALID) DROP;
+               proto icmp ACCEPT;
+       }
+}
+
+include "dsa.d/*";

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index d97e181..a8798c8 100644 (file)
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -1,5 +1,5 @@
 class ferm {
-       define ferm_rule($domain="ip", $chain="INPUT", $rule, $description="", $prio="00") {
+       define rule($domain="ip", $chain="INPUT", $rule, $description="", $prio="00") {
                file { "/etc/ferm/dsa.d/${prio}_${name}":
                        ensure  => present,
                        owner   => root,
@@ -15,12 +15,21 @@ class ferm {
                 "/etc/ferm/dsa.d": 
                         ensure => directory,
                         require => Package["ferm"];
-                "/etc/ferm/dsa.d/me.conf":
+                "/etc/ferm/conf.d": 
+                        ensure => directory,
+                        require => Package["ferm"];
+                "/etc/ferm/conf.d/me.conf":
                         content => template("ferm/me.conf.erb"),
                         require => Package["ferm"],
                         notify  => Exec["ferm restart"];
         }
 
+        ferm::rule { "dsa-ssh":
+                description     => "Allow SSH from DSA",
+                rule            => "proto tcp dport ssh ACCEPT"
+        }
+
+        ferm_rule(
         exec { "ferm restart":
                 path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
                 refreshonly => true,