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

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index c58c8d94a..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;
@@ -25,7 +43,6 @@ class debian-org {
              "pdksh": ensure => installed;
              "ksh": ensure => installed;
              "csh": ensure => installed;
-             "ntp": ensure => installed;
              "locales-all": ensure => installed;
              "libpam-pwdfile": ensure => installed;
              "vim": ensure => installed;
@@ -49,16 +66,16 @@ class debian-org {
       "/etc/apt/preferences":
              source => "puppet:///files/etc/apt/preferences";
       "/etc/apt/sources.list.d/backports.org.list":
-             source => "puppet:///files/etc/apt/sources.list.d/backports.org.list",
+             content => template("debian-org/etc/apt/sources.list.d/backports.org.list.erb"),
              notify  => Exec["apt-get update"];
       "/etc/apt/sources.list.d/debian.org.list":
-             source => "puppet:///files/etc/apt/sources.list.d/debian.org.list",
+             content => template("debian-org/etc/apt/sources.list.d/debian.org.list.erb"),
              notify  => Exec["apt-get update"];
       "/etc/apt/sources.list.d/security.list":
-             source => "puppet:///files/etc/apt/sources.list.d/security.list",
+             content => template("debian-org/etc/apt/sources.list.d/security.list.erb"),
              notify  => Exec["apt-get update"];
       "/etc/apt/sources.list.d/volatile.list":
-             source => "puppet:///files/etc/apt/sources.list.d/volatile.list",
+             content => template("debian-org/etc/apt/sources.list.d/volatile.list.erb"),
              notify  => Exec["apt-get update"];
       "/etc/apt/apt.conf.d/local-recommends":
              source => "puppet:///files/etc/apt/apt.conf.d/local-recommends";
@@ -148,12 +165,18 @@ class debian-org {
 class debian-proliant inherits debian-org {
    package {
       "hpacucli": ensure => installed;
+      "hp-health": ensure => installed;
       "cpqarrayd": ensure => installed;
       "arrayprobe": ensure => installed;
    }
+   case $debarchitecture {
+      "amd64": {
+         package { "lib32gcc1": ensure => installed; }
+      }
+   }
    file {
       "/etc/apt/sources.list.d/debian.restricted.list":
-             source => "puppet:///files/etc/apt/sources.list.d/debian.restricted.list",
+             content => template("debian-org/etc/apt/sources.list.d/debian.restricted.list.erb"),
              notify  => Exec["apt-get update"];
    }
 }