make apache stuff a little more automatic

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/manifests/site.pp b/manifests/site.pp
index 59bce1cdfc4dd9d5409aa6cd70de65af6ae58d32..473f36ce54eedaf2c6f2c9aaab9aec4fdf0e9016 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -54,17 +54,18 @@ node default {
        }
     }
 
-    case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
-         "true":  { include apache2 }
+    case $apache2 {
+         "true":  {
+              case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
+                     "true":  { include apache2::security_mirror }
+                     default  { include apache2 }
+              }
+         }
     }
 
     case extractnodeinfo($nodeinfo, 'buildd') {
          "true":  { include buildd }
     }
-    case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
-         "true":  { include apache2::security_mirror }
-    }
-
 
 # maybe wait for rietz to be upgraded to lenny
     case $hostname {

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 90c2f824a457f2521f8c8828421773f85581e415..526ec888794d8f5ff1b9dce061c891ca00654a10 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -6,6 +6,30 @@ class apache2 {
                "logrotate": ensure => installed;
        }
 
+        define activate_apache_site($ensure=present, $site=$name) {
+                case $site {
+                        "": { $base = $name }
+                        default: { $base = $site }
+                }
+
+                case $ensure {
+                        present: {
+                                file { "/etc/apache2/sites-enabled/$name":
+                                         ensure => "/etc/apache2/sites-available/$base",
+                                         require => Package["apache2"],
+                                         notify => Exec["reload-apache2"];
+                                }
+                        }
+                        absent: {
+                                file { "/etc/apache2/sites-enabled/$name":
+                                         ensure => $ensure,
+                                         notify => Exec["reload-apache2"];
+                                }
+                        }
+                       default: { err ( "Unknown ensure value: '$ensure'" ) }
+                }
+        }
+
        define enable_module($ensure=present) {
                case $ensure {
                        present: {
@@ -29,6 +53,11 @@ class apache2 {
                 "status":;
         }
 
+        activate_apache_site {
+                "00-default": site => "default-debian.org";
+                "000-default": ensure => absent;
+        }
+
        file {
                "/etc/apache2/conf.d/ressource-limits":
                        content => template("apache2/ressource-limits.erb"),

diff --git a/modules/apache2/manifests/security_mirror.pp b/modules/apache2/manifests/security_mirror.pp
index ee20e9d9eb8c9c2662c0ba258754833b71c93ffb..85adcf1de49b788c19ca3205a97f944970aa0ea3 100644 (file)
--- a/modules/apache2/manifests/security_mirror.pp
+++ b/modules/apache2/manifests/security_mirror.pp
@@ -2,11 +2,14 @@ class apache2::security_mirror inherits apache2 {
        file {
                "/etc/apache2/sites-available/security.debian.org":
                        source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/sites-available/security.debian.org",
-                                    "puppet:///apache2/common/etc/apache2/sites-available/security.debian.org" ],
-                       require => Package["apache2"],
-                       notify  => Exec["reload-apache2"];
+                                    "puppet:///apache2/common/etc/apache2/sites-available/security.debian.org" ];
 
        }
 
+       activate_apache_site {
+               "010-security.debian.org": site => "security.debian.org";
+               "security.debian.org": ensure => absent;
+       }
+
 }
 

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 8526c7c1a1ac1aa08fe86699966d2e053c350f63..e0b4ba8f75d61b6660ae932c9a7b56136bbd7f5e 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -107,35 +107,6 @@ host_settings:
     - ries.debian.org
     - rietz.debian.org
     - spohr.debian.org
-  apache2_defaultconfig:
-    - bellini.debian.org
-    - carver.debian.org
-    - cimarosa.debian.org
-    - draghi.debian.org
-    - duarte.debian.org
-    - gluck.debian.org
-    - kaufmann.debian.org
-    - klecker.debian.org
-    - liszt.debian.org
-    - lobos.debian.org
-    - piatti.debian.org
-    - raff.debian.org
-    - ravel.debian.org
-    - respighi.debian.org
-    - ries.debian.org
-    - rore.debian.org
-    - saens.debian.org
-    - samosa.debian.org
-    - schein.debian.org
-    - senfl.debian.org
-    - soler.debian.org
-    - spohr.debian.org
-    - steffani.debian.org
-    - tartini.debian.org
-    - villa.debian.org
-    - widor.debian.org
-    - wieck.debian.org
-    - wolkenstein.debian.org
   apache2_security_mirror:
     - gluck.debian.org
     - kassia.debian.org