X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=9ff8c854224fdb88db164431debdac4efae22f81;hb=a048716e3b9d4dfb5a9dbdcecaea8a59df4a96e7;hp=95687d21697bf93f5259f6cba41a24949ac134c9;hpb=9aff9a9156133f0d399857e06e4766c1112dc9b0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 95687d216..9ff8c8542 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -17,6 +17,24 @@ define set_alternatives($linkto) {
 
 
 class debian-org {
+   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; }"
+   }
+
    package { "userdir-ldap": ensure => installed;
              "zsh": ensure => installed;
              "cron": ensure => installed;
@@ -151,7 +169,7 @@ class debian-proliant inherits debian-org {
       "cpqarrayd": ensure => installed;
       "arrayprobe": ensure => installed;
    }
-   case $architecture {
+   case $debarchitecture {
       "amd64": {
          package { "lib32gcc1": ensure => installed; }
       }