Mercurial > repos > other > Puppet
comparison 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 |
comparison
equal
deleted
inserted
replaced
252:47750947f4dc | 257:675c1cc61eaf |
---|---|
6 $maxrequestsperchild = '1000', | 6 $maxrequestsperchild = '1000', |
7 $idletimeout = '120', | 7 $idletimeout = '120', |
8 $expiretimeout = '120', | 8 $expiretimeout = '120', |
9 $keepalive = 'Off', | 9 $keepalive = 'Off', |
10 ) { | 10 ) { |
11 | 11 include ::apache |
12 case $::osfamily { | 12 case $::osfamily { |
13 'freebsd' : { | 13 'freebsd' : { |
14 fail("Unsupported osfamily ${::osfamily}") | 14 fail("Unsupported osfamily ${::osfamily}") |
15 } | 15 } |
16 default: { | 16 default: { |
17 if $::osfamily == 'gentoo' { | |
18 ::portage::makeconf { 'apache2_mpms': | |
19 content => 'peruser', | |
20 } | |
21 } | |
22 | |
17 if defined(Class['apache::mod::event']) { | 23 if defined(Class['apache::mod::event']) { |
18 fail('May not include both apache::mod::peruser and apache::mod::event on the same node') | 24 fail('May not include both apache::mod::peruser and apache::mod::event on the same node') |
19 } | 25 } |
20 if defined(Class['apache::mod::itk']) { | 26 if defined(Class['apache::mod::itk']) { |
21 fail('May not include both apache::mod::peruser and apache::mod::itk on the same node') | 27 fail('May not include both apache::mod::peruser and apache::mod::itk on the same node') |
27 fail('May not include both apache::mod::peruser and apache::mod::worker on the same node') | 33 fail('May not include both apache::mod::peruser and apache::mod::worker on the same node') |
28 } | 34 } |
29 File { | 35 File { |
30 owner => 'root', | 36 owner => 'root', |
31 group => $::apache::params::root_group, | 37 group => $::apache::params::root_group, |
32 mode => '0644', | 38 mode => $::apache::file_mode, |
33 } | 39 } |
34 | 40 |
35 $mod_dir = $::apache::mod_dir | 41 $mod_dir = $::apache::mod_dir |
36 | 42 |
37 # Template uses: | 43 # Template uses: |
44 # - $expiretimeout | 50 # - $expiretimeout |
45 # - $keepalive | 51 # - $keepalive |
46 # - $mod_dir | 52 # - $mod_dir |
47 file { "${::apache::mod_dir}/peruser.conf": | 53 file { "${::apache::mod_dir}/peruser.conf": |
48 ensure => file, | 54 ensure => file, |
55 mode => $::apache::file_mode, | |
49 content => template('apache/mod/peruser.conf.erb'), | 56 content => template('apache/mod/peruser.conf.erb'), |
50 require => Exec["mkdir ${::apache::mod_dir}"], | 57 require => Exec["mkdir ${::apache::mod_dir}"], |
51 before => File[$::apache::mod_dir], | 58 before => File[$::apache::mod_dir], |
52 notify => Class['apache::service'], | 59 notify => Class['apache::service'], |
53 } | 60 } |