]> gitweb.fluxo.info Git - puppet-apache.git/commitdiff
Adds support for mpm_prefork
authorSilvio Rhatto <rhatto@riseup.net>
Thu, 12 Apr 2018 13:45:04 +0000 (10:45 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Thu, 12 Apr 2018 13:45:04 +0000 (10:45 -0300)
manifests/init.pp

index 8869a8ba6407057cf6f3b8082b9943f624ae5ee3..fb3d29aa77b5ac76fd41eef99badebb1729b93b6 100644 (file)
@@ -111,12 +111,28 @@ class apache(
   # MPM selection
   # There could be only one
 
+  apache::module { "mpm_itk":
+    ensure  => $mpm ? {
+      'itk'   => present,
+      default => absent,
+    },
+    require => Package['apache', 'libapache2-mpm-itk'],
+  }
+
+  apache::module { "mpm_prefork":
+    ensure  => $mpm ? {
+      'prefork' => present,
+      default   => absent,
+    },
+    require => [ Package['apache'], Apache::Module['mpm_itk'] ],
+  }
+
   apache::module { "mpm_worker":
     ensure  => $mpm ? {
       'worker' => present,
       default  => absent,
     },
-    require => Package['apache'],
+    require => [ Package['apache'], Apache::Module['mpm_prefork'] ],
   }
 
   apache::module { "mpm_event":
@@ -127,14 +143,6 @@ class apache(
     require => [ Package['apache'], Apache::Module['mpm_worker'] ],
   }
 
-  apache::module { "mpm_itk":
-    ensure  => $mpm ? {
-      'itk'   => present,
-      default => absent,
-    },
-    require => [ Package['apache', 'libapache2-mpm-itk'], Apache::Module['mpm_event'] ],
-  }
-
   # disable compression
   # prevents BREACH attack
   # see https://superuser.com/questions/627413/how-do-i-disable-http-level-compression