Merge remote-tracking branch 'jrtc27/buster-fixes'

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index f3a598b..8aacde9 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -39,10 +39,6 @@ class apache2 {
                ensure => absent,
        }
 
-       apache2::config { 'ressource-limits':
-               ensure => absent,
-       }
-
        if has_role('udd') {
                $memlimit = 512 * 1024 * 1024
        } elsif has_role('dgit_git') {
@@ -157,21 +153,23 @@ class apache2 {
                ensure => installed,
        }
 
-       if $::hostname in [beach,buxtehude,picconi,pkgmirror-csail] {
-               include apache2::dynamic
-       } else {
-               @ferm::rule { 'dsa-http':
-                       prio        => '23',
-                       description => 'Allow web access',
-                       rule        => '&SERVICE(tcp, (http https))'
+       if (! has_role('apache_not_public')) {
+               if $::hostname in [beach,buxtehude,picconi,pkgmirror-csail] {
+                       include apache2::dynamic
+               } else {
+                       @ferm::rule { 'dsa-http':
+                               prio        => '23',
+                               description => 'Allow web access',
+                               rule        => '&SERVICE(tcp, (http https))'
+                       }
                }
-       }
 
-       @ferm::rule { 'dsa-http-v6':
-               domain          => '(ip6)',
-               prio            => '23',
-               description     => 'Allow web access',
-               rule            => '&SERVICE(tcp, (http https))'
+               @ferm::rule { 'dsa-http-v6':
+                       domain          => '(ip6)',
+                       prio            => '23',
+                       description     => 'Allow web access',
+                       rule            => '&SERVICE(tcp, (http https))'
+               }
        }
 
        exec { 'service apache2 reload':