Mercurial > repos > other > Puppet

diff 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
line wrap: on
line diff
--- a/modules/apache/manifests/mod/proxy_html.pp	Sun Dec 22 09:41:45 2019 -0500
+++ b/modules/apache/manifests/mod/proxy_html.pp	Sun Dec 22 14:43:29 2019 -0500
@@ -1,10 +1,11 @@
 class apache::mod::proxy_html {
+  include ::apache
   Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_html']
   Class['::apache::mod::proxy_http'] -> Class['::apache::mod::proxy_html']
 
   # Add libxml2
   case $::osfamily {
-    /RedHat|FreeBSD/: {
+    /RedHat|FreeBSD|Gentoo/: {
       ::apache::mod { 'xml2enc': }
       $loadfiles = undef
     }
@@ -18,6 +19,9 @@
         '10'    => ['/usr/lib/libxml2.so.2'],
         default => ["/usr/lib/${gnu_path}-linux-gnu/libxml2.so.2"],
       }
+      if versioncmp($::apache::apache_version, '2.4') >= 0 {
+        ::apache::mod { 'xml2enc': }
+      }
     }
   }
 
@@ -29,6 +33,7 @@
   file { 'proxy_html.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/proxy_html.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/proxy_html.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],