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

[dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 59bcf74df3ae50bb82ae8a16ccefe57825da69a5..4ad02242ac9acfd6afb3d2a89c456022d66be703 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -29,6 +29,7 @@ node default {
     include monit
     include apt-keys
     include ntp
+    include ssl
 
     include motd
 
@@ -91,7 +92,7 @@ node default {
     }
 
     case $hostname {
-        franck,powell,logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos,raff,gluck,schein,wieck,steffani,ball,handel,tchaikovsky,heininen: { include ferm }
+        franck,powell,logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos,raff,gluck,schein,wieck,steffani,ball,handel,tchaikovsky,heininen,nielsen,kokkonen: { include ferm }
     }
     case $hostname {
         zandonai,zelenka: {
@@ -168,11 +169,11 @@ node default {
           }
        }
         heininen: {
-          @ferm::rule { "dsa-puppet":
+          @ferm::rule { "dsa-syslog":
                    description     => "Allow syslog access",
                    rule            => "&SERVICE_RANGE(tcp, 5140, \$HOST_DEBIAN_V4)"
           }
-          @ferm::rule { "dsa-puppet-v6":
+          @ferm::rule { "dsa-syslog-v6":
                    domain          => 'ip6',
                    description     => "Allow syslog access",
                    rule            => "&SERVICE_RANGE(tcp, 5140, \$HOST_DEBIAN_V6)"