X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=95ccf82db101d5c110e40e1973cd50f8197a5a69;hb=2d1ec427e3c71ed97101e3dc53b8ece95624d67f;hp=9cd01c49d56d65ea09d6815d146d68bcc4c4a404;hpb=6cd11592f10a9294b671b06b8641df66354dae52;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 9cd01c49d..95ccf82db 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -63,14 +63,6 @@ class apache2(
     ensure => absent,
   }
 
-  if has_role('udd') {
-    $memlimit = 512 * 1024 * 1024
-  } elsif has_role('popcon') {
-    $memlimit = 512 * 1024 * 1024
-  } else {
-    $memlimit = $rlimitmem
-  }
-
   apache2::config { 'resource-limits':
     content => template('apache2/resource-limits.erb'),
   }
@@ -155,7 +147,7 @@ class apache2(
     if $rate_limit {
       include apache2::dynamic
     } else {
-      ferm::rule { 'dsa-http':
+      ferm::rule { 'dsa-http-allow':
         description => 'http subchain, allow everything',
         prio        => '90',
         chain       => 'http',
@@ -178,6 +170,6 @@ class apache2(
   }
 
   apache2::config { 'local-scheduled-shutdown':
-    source => 'puppet:///modules/apache2/local-scheduled-shutdown',
+    ensure => 'absent',
   }
 }