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

diff --git a/manifests/site.pp b/manifests/site.pp
index f72232fc9..0c71c52d3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -17,7 +17,7 @@ node default {
     $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
     $nodeinfo  = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
     $allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose mXRecord")
-    notice( sprintf("hoster for %s is %s", $fqdn, $nodeinfo['hoster']['name']) )
+    notice( sprintf("hoster for %s is %s", $fqdn, getfromhash($nodeinfo, 'hoster', 'name') ) )
 
     include munin-node
     include syslog-ng
@@ -35,6 +35,28 @@ 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 }
     }
@@ -98,16 +120,13 @@ node default {
     case $hostname {
         klecker,ravel,senfl,orff,draghi: { include named::authoritative }
         geo1,geo2,geo3:                  { include named::geodns }
-        franck,liszt,master,samosa,spohr,widor:   { include named::recursor }
+        liszt:                           { include named::recursor }
     }
     case $hostname {
-        ries:   {
-            include unbound
-            $runs_local_resolver = true
-        }
-        default: {
-            $runs_local_resolver = false
-        }
+        franck,master,lobos,samosa,spohr,widor:   { include unbound }
+    }
+    case getfromhash($nodeinfo, 'squeeze') {
+        true:  { include unbound }
     }
     include resolv