reload apache2 on sso RP hosts after sso files changed

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 03976954d28cd52d1facfd61ff79238faaaa2c13..8be585bfa2b5b2f7fa8fd2d9cc11b591a645a707 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,3 +1,11 @@
+# = Class: apache2
+#
+# Standard apache config debian.org hosts
+#
+# == Sample Usage:
+#
+#   include apache2
+#
 class apache2 {
        package { 'apache2':
                ensure => installed,
@@ -10,6 +18,7 @@ class apache2 {
 
        apache2::module { 'info': }
        apache2::module { 'status': }
+       apache2::module { 'headers': }
 
        package { 'libapache2-mod-macro':
                ensure => installed
@@ -28,10 +37,28 @@ class apache2 {
                ensure => absent,
        }
 
+       apache2::config { 'serve-cgi-bin':
+               ensure => absent,
+       }
+
        apache2::config { 'ressource-limits':
                ensure => absent,
        }
 
+       if has_role('udd') {
+               $memlimit = 512 * 1024 * 1024
+       } elsif has_role('dgit_git') {
+               $memlimit = 512 * 1024 * 1024
+       } elsif has_role('sso') {
+               $memlimit = 512 * 1024 * 1024
+       } elsif has_role('popcon') {
+               $memlimit = 512 * 1024 * 1024
+       } elsif has_role('qamaster') {
+               $memlimit = 300 * 1024 * 1024
+       } else {
+               $memlimit = 192 * 1024 * 1024
+       }
+
        apache2::config { 'resource-limits':
                content => template('apache2/resource-limits.erb'),
        }
@@ -56,6 +83,20 @@ class apache2 {
                source => 'puppet:///modules/apache2/puppet-ssl-macros',
        }
 
+       apache2::config { 'puppet-config':
+               content => template('apache2/puppet-config.erb'),
+       }
+
+       apache2::config { 'pratchett':
+               source => 'puppet:///modules/apache2/pratchett',
+       }
+
+       if $::lsbmajdistrelease > 7 {
+               file { '/etc/apache2/mods-available/mpm_worker.conf':
+                       content => template('apache2/mpm_worker.erb'),
+               }
+       }
+
        file { '/etc/apache2/sites-available/common-ssl.inc':
                ensure => absent,
        }
@@ -73,6 +114,11 @@ class apache2 {
                content => template('apache2/default-index.html'),
        }
 
+       file { '/var/log/apache2/.nobackup':
+               mode    => '0644',
+               content => '',
+       }
+
        munin::check { 'apache_accesses': }
        munin::check { 'apache_processes': }
        munin::check { 'apache_volume': }
@@ -97,4 +143,11 @@ class apache2 {
                description     => 'Allow web access',
                rule            => '&SERVICE(tcp, (http https))'
        }
+
+       exec { 'service apache2 reload':
+               path        => '/usr/bin:/usr/sbin:/bin:/sbin',
+               command     => 'service apache2 reload',
+               refreshonly => true,
+               require =>  Package['apache2'],
+       }
 }