oops, missing quote

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 2a7366d81411ee6810f179ab0211ec3dd690341b..ad09884224da2e47b52ac53af71e2d5bd62cd93e 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,25 +1,92 @@
+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/logrotate.d/apache2":
+                       source  => [ "puppet:///apache2/per-host/$fqdn/etc/logrotate.d/apache2",
+                                    "puppet:///apache2/common/etc/logrotate.d/apache2" ];
+
+               "/srv/www":
+                       mode    => 755,
+                       ensure  => directory;
+               "/srv/www/default.debian.org":
+                       mode    => 755,
+                       ensure  => directory;
                "/srv/www/default.debian.org/htdocs":
                        mode    => 755,
                        ensure  => directory;
                "/srv/www/default.debian.org/htdocs/index.html":
-                       content => template("default-index.html");
+                       content => template("apache2/default-index.html");
+
+               # 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,
        }
 }