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

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/peruser.pp	Sun Dec 22 09:41:45 2019 -0500
+++ b/modules/apache/manifests/mod/peruser.pp	Sun Dec 22 14:43:29 2019 -0500
@@ -8,12 +8,18 @@
   $expiretimeout = '120',
   $keepalive = 'Off',
 ) {
-
+  include ::apache
   case $::osfamily {
     'freebsd' : {
       fail("Unsupported osfamily ${::osfamily}")
     }
     default: {
+      if $::osfamily == 'gentoo' {
+        ::portage::makeconf { 'apache2_mpms':
+          content => 'peruser',
+        }
+      }
+
       if defined(Class['apache::mod::event']) {
         fail('May not include both apache::mod::peruser and apache::mod::event on the same node')
       }
@@ -29,7 +35,7 @@
       File {
         owner => 'root',
         group => $::apache::params::root_group,
-        mode  => '0644',
+        mode  => $::apache::file_mode,
       }
 
       $mod_dir = $::apache::mod_dir
@@ -46,6 +52,7 @@
       # - $mod_dir
       file { "${::apache::mod_dir}/peruser.conf":
         ensure  => file,
+        mode    => $::apache::file_mode,
         content => template('apache/mod/peruser.conf.erb'),
         require => Exec["mkdir ${::apache::mod_dir}"],
         before  => File[$::apache::mod_dir],