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

diff --git a/manifests/site.pp b/manifests/site.pp
index 394cf8fa7..0c71c52d3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -16,9 +16,8 @@ Exec {
 node default {
     $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
     $nodeinfo  = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
-    $hosterinfo = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
-    $allnodeinfo = allnodeinfo("sshRSAHostKey", "ipHostNumber", "purpose", "mXRecord")
-    notice("hoster for ${fqdn} is ${hosterinfo}")
+    $allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose mXRecord")
+    notice( sprintf("hoster for %s is %s", $fqdn, getfromhash($nodeinfo, 'hoster', 'name') ) )
 
     include munin-node
     include syslog-ng
@@ -36,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 }
     }
@@ -99,21 +120,15 @@ 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($hosterinfo, 'nameservers') {
-        false:      {}
-        default:    { include resolv }
+    case getfromhash($nodeinfo, 'squeeze') {
+        true:  { include unbound }
     }
+    include resolv
 
     case $kernel {
         Linux: {