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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 7884116ac..dc8c66c8d 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,29 +1,51 @@
-define enable_module($ensure=present, $require=apache2) {
-        case $ensure {
-                present: {
-                        exec { "/usr/sbin/a2enmod $name":
-                                unless => "/bin/sh -c '[ -L /etc/apache2/mods-enabled/${name}.load ]',
-                                notify => Exec["force-reload-apache2"],
-                                require => Package[$require],
-                        }
-                }
-                absent: {
-                        exec { "/usr/sbin/a2dismod $name":
-                                onlyif => "/bin/sh -c '[ -L /etc/apache2/mods-enabled/${name}.load ]',
-                                notify => Exec["force-reload-apache2"],
-                                require => Package[$require],
-                        }
-                }
-                default: { err ( "Unknown ensure value: '$ensure'" ) }
-         }
-}
-
 class apache2 {
         include munin-node::apache
 
 	package {
-		apache2: ensure => installed;
-		logrotate: ensure => installed;
+		"apache2": ensure => installed;
+		"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: {
+	                        exec { "/usr/sbin/a2enmod $name":
+	                                unless => "/bin/sh -c '[ -L /etc/apache2/mods-enabled/${name}.load ]'",
+	                                notify => Exec["force-reload-apache2"],
+	                        }
+	                }
+	                absent: {
+	                        exec { "/usr/sbin/a2dismod $name":
+	                                onlyif => "/bin/sh -c '[ -L /etc/apache2/mods-enabled/${name}.load ]'",
+	                                notify => Exec["force-reload-apache2"],
+	                        }
+	                }
+	                default: { err ( "Unknown ensure value: '$ensure'" ) }
+	         }
 	}
 
         enable_module {
@@ -31,32 +53,36 @@ 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"),
 			require => Package["apache2"],
-			notify  => Exec["apache2 reload"];
+                        notify  => Exec["reload-apache2"];
 		"/etc/apache2/conf.d/security":
 			source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/conf.d/security",
 			             "puppet:///apache2/common/etc/apache2/conf.d/security" ],
 			require => Package["apache2"],
-			notify  => Exec["apache2 reload"];
+                        notify  => Exec["reload-apache2"];
 		"/etc/apache2/conf.d/local-serverinfo":
 			source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/conf.d/local-serverinfo",
 			             "puppet:///apache2/common/etc/apache2/conf.d/local-serverinfo" ],
 			require => Package["apache2"],
-			notify  => Exec["apache2 reload"];
+                        notify  => Exec["reload-apache2"];
 		"/etc/apache2/conf.d/server-status":
 			source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/conf.d/server-status",
 			             "puppet:///apache2/common/etc/apache2/conf.d/server-status" ],
 			require => Package["apache2"],
-			notify  => Exec["apache2 reload"];
+                        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["apache2 reload"];
+                        notify  => Exec["reload-apache2"];
 
 		"/etc/logrotate.d/apache2":
 			source  => [ "puppet:///apache2/per-host/$fqdn/etc/logrotate.d/apache2",
@@ -80,8 +106,13 @@ class apache2 {
 		#	ensure  => directory;
 	}
 
-	exec { "apache2 reload":
-		path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-		refreshonly => true,
+	exec { "reload-apache2":
+               command => "/etc/init.d/apache2 reload",
+               refreshonly => true,
+        }
+
+        exec { "force-reload-apache2":
+               command => "/etc/init.d/apache2 force-reload",
+               refreshonly => true,
 	}
 }