X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=3e5e5f312153af9bc5764a539457e84edebd7631;hb=0e4256d4d60e13c82c6e02a0393a53075db99ea4;hp=b0d412981f60c8781af3b5d0b8ded43ade6a81db;hpb=f47bff9d61788f7422f2d0295caec252f30b41d7;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index b0d412981..3e5e5f312 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")
     $hoster    = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
-    $keyinfo   = allnodeinfo("sshRSAHostKey", "ipHostNumber")
+    $keyinfo   = allnodeinfo("sshRSAHostKey", "ipHostNumber", "purpose")
     $mxinfo    = allnodeinfo("mXRecord")
     notice("hoster for ${fqdn} is ${hoster}")
 
@@ -44,7 +44,7 @@ node default {
         "true": {
             package { acpid: ensure => installed }
             case extractnodeinfo($nodeinfo, 'squeeze') {
-                'true':  { package { acpi-support-base: ensure => installed } }
+                true:  { package { acpi-support-base: ensure => installed } }
             }
         }
     }
@@ -55,12 +55,16 @@ node default {
     case $mta {
         "exim4":   {
              case extractnodeinfo($nodeinfo, 'heavy_exim') {
-                  'true':  { include exim::mx }
+                  true:  { include exim::mx }
                   default: { include exim }
              }
         }
     }
 
+    case extractnodeinfo($nodeinfo, 'puppetmaster') {
+        true: { include puppetmaster }
+    }
+
     case extractnodeinfo($nodeinfo, 'muninmaster') {
         true: { include munin-node::master }
     }
@@ -74,8 +78,11 @@ node default {
          "true":  {
               case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
                      true:    { include apache2::security_mirror }
-                     default: { include apache2 }
               }
+              case extractnodeinfo($nodeinfo, 'apache2_www_mirror') {
+                     true:    { include apache2::www_mirror }
+              }
+              include apache2
          }
     }
 
@@ -85,7 +92,7 @@ node default {
 
 
     case extractnodeinfo($nodeinfo, 'buildd') {
-         'true':  {
+         true:  {
              include buildd
          }
     }
@@ -128,7 +135,7 @@ node default {
         byrd,schuetz,tchaikovsky: {
             include krb
         }
-        draghi,quantz,samosa: {
+        draghi,quantz: {
             include krb
             include afs
         }
@@ -137,6 +144,12 @@ node default {
             include afs::server
         }
     }
+
+    case $hostname {
+        chopin,geo3,soler,wieck: {
+            include debian-radvd
+        }
+   }
 }
 
 # vim:set et: