X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=6b6b43e2b677e2e81d8d09333daec8a384dde316;hb=7a49d7afd1a5e7c5974f3fa375c0149f4c711276;hp=0c71c52d3469b62856491d215dff63c789f453fb;hpb=da0daac848f0f8e481932be94be791f37fe8a9bf;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 0c71c52d3..6b6b43e2b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,28 +35,6 @@ node default {
         finzi,fano,fasch,field:    { include kfreebsd }
     }
 
-    case $hostname {
-        heininen:    {
-            include "stunnel4"
-            stunnel4::stunnel_server {
-                "ekeyd":
-                    accept => 18888,
-                    connect => "127.0.0.1:8888",
-                    ;
-            }
-        }
-        unger:    {
-            include "stunnel4"
-            stunnel4::stunnel_client {
-                "ekeyd":
-                    accept => "127.0.0.1:8888",
-                    connecthost => "heininen.debian.org",
-                    connectport => 18888,
-                    ;
-            }
-        }
-    }
-
     case $smartarraycontroller {
         "true":    { include debian-proliant }
     }
@@ -118,9 +96,9 @@ node default {
     }
 
     case $hostname {
-        klecker,ravel,senfl,orff,draghi: { include named::authoritative }
-        geo1,geo2,geo3:                  { include named::geodns }
-        liszt:                           { include named::recursor }
+        klecker,ravel,senfl,orff,draghi,diamond: { include named::authoritative }
+        geo1,geo2,geo3:                          { include named::geodns }
+        liszt:                                   { include named::recursor }
     }
     case $hostname {
         franck,master,lobos,samosa,spohr,widor:   { include unbound }
@@ -141,7 +119,7 @@ node default {
     }
 
     case $hostname {
-        beethoven,ravel,spohr,stabile: {
+        beethoven,duarte,ravel,spohr,stabile: {
             include nfs-server
         }
     }
@@ -173,7 +151,12 @@ node default {
         chopin,geo3,soler,wieck: {
             include debian-radvd
         }
-   }
+    }
+
+    case $kernel {
+        Linux: { include entropykey }
+    }
+
 }
 
 # vim:set et: