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 67e6b8bad288a357e84d029bd998e569648a75a5..8be585bfa2b5b2f7fa8fd2d9cc11b591a645a707 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -47,12 +47,14 @@ class apache2 {
 
        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
-       } elsif has_role('snapshot_master') {
-               $memlimit = 300 * 1024 * 1024
        } else {
                $memlimit = 192 * 1024 * 1024
        }
@@ -141,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'],
+       }
 }