Mercurial > repos > other > Puppet

diff modules/apache/spec/acceptance/version.rb @ 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
line wrap: on
line diff
--- a/modules/apache/spec/acceptance/version.rb	Sun Dec 22 09:41:45 2019 -0500
+++ b/modules/apache/spec/acceptance/version.rb	Sun Dec 22 14:43:29 2019 -0500
@@ -5,12 +5,12 @@
 case _osfamily
 when 'RedHat'
   $confd_dir        = '/etc/httpd/conf.d'
-  $mod_dir          = '/etc/httpd/conf.d'
   $conf_file        = '/etc/httpd/conf/httpd.conf'
   $ports_file       = '/etc/httpd/conf/ports.conf'
   $vhost_dir        = '/etc/httpd/conf.d'
   $vhost            = '/etc/httpd/conf.d/15-default.conf'
   $run_dir          = '/var/run/httpd'
+  $doc_root          = '/var/www'
   $service_name     = 'httpd'
   $package_name     = 'httpd'
   $error_log        = 'error_log'
@@ -19,8 +19,10 @@
 
   if (_operatingsystem == 'Fedora' and _operatingsystemrelease >= 18) or (_operatingsystem != 'Fedora' and _operatingsystemrelease >= 7)
     $apache_version = '2.4'
+    $mod_dir        = '/etc/httpd/conf.modules.d'
   else
     $apache_version = '2.2'
+    $mod_dir        = '/etc/httpd/conf.d'
   end
 when 'Debian'
   $confd_dir        = '/etc/apache2/conf.d'
@@ -30,6 +32,7 @@
   $vhost            = '/etc/apache2/sites-available/15-default.conf'
   $vhost_dir        = '/etc/apache2/sites-enabled'
   $run_dir          = '/var/run/apache2'
+  $doc_root          = '/var/www'
   $service_name     = 'apache2'
   $package_name     = 'apache2'
   $error_log        = 'error.log'
@@ -51,12 +54,43 @@
   $vhost            = '/usr/local/etc/apache24/Vhosts/15-default.conf'
   $vhost_dir        = '/usr/local/etc/apache24/Vhosts'
   $run_dir          = '/var/run/apache24'
+  $doc_root          = '/var/www'
   $service_name     = 'apache24'
   $package_name     = 'apache24'
   $error_log        = 'http-error.log'
 
   $apache_version = '2.2'
+when 'Gentoo'
+  $confd_dir        = '/etc/apache2/conf.d'
+  $mod_dir          = '/etc/apache2/modules.d'
+  $conf_file        = '/etc/apache2/httpd.conf'
+  $ports_file       = '/etc/apache2/ports.conf'
+  $vhost            = '/etc/apache2/vhosts.d/15-default.conf'
+  $vhost_dir        = '/etc/apache2/vhosts.d'
+  $run_dir          = '/var/run/apache2'
+  $doc_root          = '/var/www'
+  $service_name     = 'apache2'
+  $package_name     = 'www-servers/apache'
+  $error_log        = 'http-error.log'
+
+  $apache_version = '2.4'
+when 'Suse'
+  $confd_dir        = '/etc/apache2/conf.d'
+  $mod_dir          = '/etc/apache2/mods-available'
+  $conf_file        = '/etc/apache2/httpd.conf'
+  $ports_file       = '/etc/apache2/ports.conf'
+  $vhost            = '/etc/apache2/sites-available/15-default.conf'
+  $vhost_dir        = '/etc/apache2/sites-available'
+  $run_dir          = '/var/run/apache2'
+  $doc_root         = '/srv/www'
+  $service_name     = 'apache2'
+  $package_name     = 'apache2'
+  $error_log        = 'error.log'
+  if _operatingsystemrelease < 12
+    $apache_version   = '2.2'
+  else
+    $apache_version   = '2.4'
+  end
 else
   $apache_version = '0'
 end
-