new geoip dns setup

[mirror/dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index cdecc63..2135141 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -31,7 +31,12 @@ node default {
     }
 
     case $mta {
-        "exim4":   { include exim }
+        "exim4":   {
+             case extractnodeinfo($nodeinfo, 'heavy_exim') {
+                  "true":  { include exim::mx }
+                  default: { include exim }
+             }
+        }
         default:   {}
     }
 
@@ -47,7 +52,7 @@ node default {
 
     case $apache2 {
         "true":    { case $hostname {
-                        carver,rore,draghi,tartini,samosa,duarte:  { include apache2 }
+                        carver,rore,draghi,tartini,samosa,duarte,piatti:  { include apache2 }
                         default:   {}
                    } }
         default: {}
@@ -66,11 +71,11 @@ node default {
 #        default:   {}
 #    }
 
-    case $hostname {
-        geo1,geo2,geo3:
-                   { include geodns }
-        default:   {}
-    }
+     case $hostname {
+         geo1,geo2,geo3:
+                    { include geodns }
+         default:   {}
+     }
 }
 
 node penalosa inherits default {