Rework apache2 module enable command to allow for disabling modules and

[dsa-puppet.git] / modules / apache2 / manifests / init.pp

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 8e9a7950e3484e384050be72484470405266b130..7884116ac8b5857b3a6c52b81c4852e72a1b5069 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,12 +1,39 @@
+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":
-                       template("apache2/ressource-limits.erb"),
+                       content => template("apache2/ressource-limits.erb"),
                        require => Package["apache2"],
                        notify  => Exec["apache2 reload"];
                "/etc/apache2/conf.d/security":
@@ -14,6 +41,16 @@ class apache2 {
                                     "puppet:///apache2/common/etc/apache2/conf.d/security" ],
                        require => Package["apache2"],
                        notify  => Exec["apache2 reload"];
+               "/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"];
+               "/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"];
 
                "/etc/apache2/sites-available/default-debian.org":
                        source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/sites-available/default-debian.org",