Mercurial > repos > other > Puppet

diff modules/apache/manifests/mod/info.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/info.pp	Sun Dec 22 09:41:45 2019 -0500
+++ b/modules/apache/manifests/mod/info.pp	Sun Dec 22 14:43:29 2019 -0500
@@ -1,15 +1,30 @@
 class apache::mod::info (
   $allow_from      = ['127.0.0.1','::1'],
-  $apache_version  = $::apache::apache_version,
+  $apache_version  = undef,
   $restrict_access = true,
+  $info_path       = '/server-info',
 ){
-  apache::mod { 'info': }
-  # Template uses
-  # $allow_from
-  # $apache_version
+  include ::apache
+  $_apache_version = pick($apache_version, $apache::apache_version)
+
+  if $::osfamily == 'Suse' {
+    if defined(Class['::apache::mod::worker']){
+      $suse_path = '/usr/lib64/apache2-worker'
+    } else {
+      $suse_path = '/usr/lib64/apache2-prefork'
+    }
+    ::apache::mod { 'info':
+      lib_path => $suse_path,
+    }
+  } else {
+    ::apache::mod { 'info': }
+  }
+
+  # Template uses $allow_from, $_apache_version
   file { 'info.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/info.conf",
+    mode    => $::apache::file_mode,
     content => template('apache/mod/info.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],