X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=dc8c66c8d2fa6d27f6a95f72198a8d80aaa983a9;hb=44ce3cff49b71e9c60c07751088c64467fca4bb5;hp=90c2f824a457f2521f8c8828421773f85581e415;hpb=f021caecf7f1878c55f5e703551874c52d778c86;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 90c2f824a..dc8c66c8d 100644
--- 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"),
@@ -51,8 +80,7 @@ class apache2 {
                         notify  => Exec["reload-apache2"];
 
 		"/etc/apache2/sites-available/default-debian.org":
-			source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/sites-available/default-debian.org",
-			             "puppet:///apache2/common/etc/apache2/sites-available/default-debian.org" ],
+			content => template("apache2/default-debian.org.erb"),
 			require => Package["apache2"],
                         notify  => Exec["reload-apache2"];