ok, so package relationships aren't working for me yet

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 633a47328605ae80ffdd53ce360011739849b9fb..90c2f824a457f2521f8c8828421773f85581e415 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,43 +1,60 @@
-define enable_module($module) {
-        exec { "/usr/sbin/a2enmod $module": }
-}
-
 class apache2 {
+        include munin-node::apache
+
        package {
-               apache2: ensure => installed;
-               logrotate: ensure => installed;
+               "apache2": ensure => installed;
+               "logrotate": ensure => installed;
+       }
+
+       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 {
-                "info": module => info;
-                "status": module => status;
+                "info":;
+                "status":;
         }
 
        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["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" ],
                        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",
@@ -61,8 +78,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,
        }
 }