Debian Policy is moving back to multi-page version, revert redirects

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 985620f..5fa11d4 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -105,10 +105,8 @@ class apache2 {
                apache2::module { 'mpm_prefork': ensure => absent }
                apache2::module { 'mpm_worker': }
        }
-       if versioncmp($::lsbmajdistrelease, '7') > 0 {
-               file { '/etc/apache2/mods-available/mpm_worker.conf':
-                       content => template('apache2/mpm_worker.erb'),
-               }
+       file { '/etc/apache2/mods-available/mpm_worker.conf':
+               content => template('apache2/mpm_worker.erb'),
        }
 
        file { '/etc/apache2/sites-available/common-ssl.inc':
@@ -153,23 +151,25 @@ 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 has_role('apache_ratelimited') {
+                       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':
                path        => '/usr/bin:/usr/sbin:/bin:/sbin',
                command     => 'service apache2 reload',