X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=8b07c27b0c0ca1ab02f7435bd6e6a82c1c1d5721;hb=9e4e80d6ce4591c4cca8f87c630697d21f168cf2;hp=d14d3ff867271a1dc264b0abfb1d6da507d44367;hpb=2b27a904e41fedb49ad8a608254771388625f4b0;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index d14d3ff86..8b07c27b0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -88,12 +88,17 @@ node default {
     case $hostname {
         klecker,ravel,senfl,orff: { include named::secondary }
         geo1,geo2,geo3:           { include named::geodns }
-        bartok,schein,steffani:   { include named::recursor }
+        bartok,schein,steffani,franck:   { include named::recursor }
     }
 
     case $hostname {
         franck,powell,logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos,raff,gluck,schein,wieck,steffani,ball,handel,tchaikovsky,heininen,nielsen,kokkonen,kaufmann: { include ferm }
     }
+
+    case $hostname {
+        agricola,albeniz,gabrielli,zee,zelenka: { include ferm }
+    }
+
     case $hostname {
         zandonai,zelenka: {
            @ferm::rule { "dsa-zivit-rrdcollect":
@@ -118,7 +123,7 @@ node default {
 		    rule            => "&SERVICE(tcp, 873)"
 	   }
         }
-        saens,villa,lobos,raff,gluck,schein,wieck,steffani: {
+        saens,villa,lobos,raff,gluck,schein,wieck,steffani,franck: {
            @ferm::rule { "dsa-ftp":
 		    domain          => "(ip ip6)",
 		    description     => "Allow ftp access",