Mercurial > repos > other > Puppet

comparison modules/apache/manifests/mod/proxy_html.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
comparison
equal deleted inserted replaced
252:47750947f4dc 257:675c1cc61eaf
1 class apache::mod::proxy_html { 1 class apache::mod::proxy_html {
2 include ::apache
2 Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_html'] 3 Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_html']
3 Class['::apache::mod::proxy_http'] -> Class['::apache::mod::proxy_html'] 4 Class['::apache::mod::proxy_http'] -> Class['::apache::mod::proxy_html']
4 5
5 # Add libxml2 6 # Add libxml2
6 case $::osfamily { 7 case $::osfamily {
7 /RedHat|FreeBSD/: { 8 /RedHat|FreeBSD|Gentoo/: {
8 ::apache::mod { 'xml2enc': } 9 ::apache::mod { 'xml2enc': }
9 $loadfiles = undef 10 $loadfiles = undef
10 } 11 }
11 'Debian': { 12 'Debian': {
12 $gnu_path = $::hardwaremodel ? { 13 $gnu_path = $::hardwaremodel ? {
16 $loadfiles = $::apache::params::distrelease ? { 17 $loadfiles = $::apache::params::distrelease ? {
17 '6' => ['/usr/lib/libxml2.so.2'], 18 '6' => ['/usr/lib/libxml2.so.2'],
18 '10' => ['/usr/lib/libxml2.so.2'], 19 '10' => ['/usr/lib/libxml2.so.2'],
19 default => ["/usr/lib/${gnu_path}-linux-gnu/libxml2.so.2"], 20 default => ["/usr/lib/${gnu_path}-linux-gnu/libxml2.so.2"],
20 } 21 }
22 if versioncmp($::apache::apache_version, '2.4') >= 0 {
23 ::apache::mod { 'xml2enc': }
24 }
21 } 25 }
22 } 26 }
23 27
24 ::apache::mod { 'proxy_html': 28 ::apache::mod { 'proxy_html':
25 loadfiles => $loadfiles, 29 loadfiles => $loadfiles,
27 31
28 # Template uses $icons_path 32 # Template uses $icons_path
29 file { 'proxy_html.conf': 33 file { 'proxy_html.conf':
30 ensure => file, 34 ensure => file,
31 path => "${::apache::mod_dir}/proxy_html.conf", 35 path => "${::apache::mod_dir}/proxy_html.conf",
36 mode => $::apache::file_mode,
32 content => template('apache/mod/proxy_html.conf.erb'), 37 content => template('apache/mod/proxy_html.conf.erb'),
33 require => Exec["mkdir ${::apache::mod_dir}"], 38 require => Exec["mkdir ${::apache::mod_dir}"],
34 before => File[$::apache::mod_dir], 39 before => File[$::apache::mod_dir],
35 notify => Class['apache::service'], 40 notify => Class['apache::service'],
36 } 41 }