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

diff --git a/manifests/site.pp b/manifests/site.pp
index 0c71c52d3..8a5c9711e 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 }
     }
@@ -173,7 +151,12 @@ node default {
         chopin,geo3,soler,wieck: {
             include debian-radvd
         }
-   }
+    }
+
+    case $kernel {
+        Linux: { include entropykey }
+    }
+
 }
 
 # vim:set et: