Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

diff --git a/manifests/site.pp b/manifests/site.pp
index b073422af67a18cc7afe687c8d4c6686e4fbb541..f287164dfb23c0d51ee08f13bb573a4f92c65e37 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -87,7 +87,7 @@ node default {
     }
 
     case $hostname {
-        cilea,luchesi,merikanto,paganini,rautavaara,sibelius,spohr: {}
+        cilea,luchesi,merikanto,paganini,rautavaara,sibelius: {}
         default: {
              case $kernel {
                  Linux: {

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 2d6c5bda37b438ec72a2700aa7b922ecace0aca2..5a9d48b69ab6b511945b4207eb82e2e101a905af 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -18,7 +18,7 @@ class ferm::per-host {
     }
 
     case $hostname {
-        ravel: {
+        ravel,spohr: {
             include ferm::nfs-server
         }
     }
@@ -31,6 +31,16 @@ class ferm::per-host {
            }
         }
 
+        paganini: {
+           @ferm::rule { "dsa-dhcp":
+                   description     => "Allow dhcp access",
+                   rule            => "&SERVICE(udp, 67)"
+          }
+           @ferm::rule { "dsa-tftp":
+                   description     => "Allow tftp access",
+                   rule            => "&SERVICE(udp, 69)"
+          }
+        }
         handel: {
           @ferm::rule { "dsa-puppet":
                    description     => "Allow puppet access",