X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=9e116006cbe826608b05f6e0f582e4a2d62b29d3;hb=88d45799f80894f439386722391a35e4541a1e87;hp=9d712a0038d22b74a970ebe7458f2c4c0c0f46de;hpb=a03c85261ca9724f599adf09d3b4b731200b0731;p=dsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 9d712a00..9e116006 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,24 +1,66 @@
+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;
 	}
 
+        enable_module {
+                "info":;
+                "status":;
+        }
+
 	file {
+		"/etc/apache2/conf.d/ressource-limits":
+			content => template("apache2/ressource-limits.erb"),
+			require => Package["apache2"],
+                        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["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["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" ],
 			require => Package["apache2"],
-			notify  => Exec["apache2 reload"];
+                        notify  => Exec["reload-apache2"];
 
-		"/etc/logroate.d/apache2":
-			source  => [ "puppet:///apache2/per-host/$fqdn/etc/logroate.d/apache2",
-			             "puppet:///apache2/common/etc/logroate.d/apache2" ];
+		"/etc/logrotate.d/apache2":
+			source  => [ "puppet:///apache2/per-host/$fqdn/etc/logrotate.d/apache2",
+			             "puppet:///apache2/common/etc/logrotate.d/apache2" ];
 
 		"/srv/www":
 			mode    => 755,
@@ -30,15 +72,21 @@ class apache2 {
 			mode    => 755,
 			ensure  => directory;
 		"/srv/www/default.debian.org/htdocs/index.html":
-			content => template("default-index.html");
+			content => template("apache2/default-index.html");
 
-		"/var/log/apache2":
-			mode    => 755,
-			ensure  => directory;
+		# sometimes this is a symlink
+		#"/var/log/apache2":
+		#	mode    => 755,
+		#	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,
 	}
 }