Mercurial > repos > other > Puppet

diff modules/apache/manifests/mod/prefork.pp @ 257:675c1cc61eaf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update Apache module to get CentOS 8 support Unfortunately it only fixes some bits. mod_wsgi still needs other approaches This also overrides the vhost modification to make them come last in the import order (after module loading)
author IBBoard <dev@ibboard.co.uk>
date Sun, 22 Dec 2019 14:43:29 -0500
parents 37675581a273
children d9352a684e62
line wrap: on
line diff
--- a/modules/apache/manifests/mod/prefork.pp	Sun Dec 22 09:41:45 2019 -0500
+++ b/modules/apache/manifests/mod/prefork.pp	Sun Dec 22 14:43:29 2019 -0500
@@ -5,12 +5,14 @@
   $serverlimit         = '256',
   $maxclients          = '256',
   $maxrequestsperchild = '4000',
-  $apache_version      = $::apache::apache_version,
+  $apache_version      = undef,
 ) {
+  include ::apache
+  $_apache_version = pick($apache_version, $apache::apache_version)
   if defined(Class['apache::mod::event']) {
     fail('May not include both apache::mod::prefork and apache::mod::event on the same node')
   }
-  if versioncmp($apache_version, '2.4') < 0 {
+  if versioncmp($_apache_version, '2.4') < 0 {
     if defined(Class['apache::mod::itk']) {
       fail('May not include both apache::mod::prefork and apache::mod::itk on the same node')
     }
@@ -24,7 +26,7 @@
   File {
     owner => 'root',
     group => $::apache::params::root_group,
-    mode  => '0644',
+    mode  => $::apache::file_mode,
   }
 
   # Template uses:
@@ -44,9 +46,9 @@
 
   case $::osfamily {
     'redhat': {
-      if versioncmp($apache_version, '2.4') >= 0 {
+      if versioncmp($_apache_version, '2.4') >= 0 {
         ::apache::mpm{ 'prefork':
-          apache_version => $apache_version,
+          apache_version => $_apache_version,
         }
       }
       else {
@@ -60,9 +62,20 @@
         }
       }
     }
-    'debian', 'freebsd' : {
+    'debian', 'freebsd': {
+      ::apache::mpm{ 'prefork':
+        apache_version => $_apache_version,
+      }
+    }
+    'Suse': {
       ::apache::mpm{ 'prefork':
         apache_version => $apache_version,
+        lib_path       => '/usr/lib64/apache2-prefork',
+      }
+    }
+    'gentoo': {
+      ::portage::makeconf { 'apache2_mpms':
+        content => 'prefork',
       }
     }
     default: {