From 70d0e06caa8a23d588d855edb1e2d32b09950865 Mon Sep 17 00:00:00 2001 From: floek Date: Mon, 4 Jul 2016 09:56:31 +0200 Subject: [PATCH 1/3] Support Apache 2.4 on SLES 12 --- manifests/version.pp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/manifests/version.pp b/manifests/version.pp index 527dc6d38d..17092ac6bf 100644 --- a/manifests/version.pp +++ b/manifests/version.pp @@ -36,7 +36,12 @@ $default = '2.4' } 'Suse': { - $default = '2.2' + if ($::operatingsystemmajrelease == '12') { + $default = '2.4' + } else { + $default = '2.2' + } + } default: { fail("Class['apache::version']: Unsupported osfamily: ${::osfamily}") From 17db8f6b1550f9ee12e8e77e1c6d199b7bac3e8f Mon Sep 17 00:00:00 2001 From: floek Date: Thu, 7 Jul 2016 15:31:21 +0200 Subject: [PATCH 2/3] Suse has prefork per default --- manifests/mod/cgi.pp | 1 + 1 file changed, 1 insertion(+) diff --git a/manifests/mod/cgi.pp b/manifests/mod/cgi.pp index 91352e8c8d..018d5acbfd 100644 --- a/manifests/mod/cgi.pp +++ b/manifests/mod/cgi.pp @@ -1,6 +1,7 @@ class apache::mod::cgi { case $::osfamily { 'FreeBSD': {} + 'Suse': {} default: { Class['::apache::mod::prefork'] -> Class['::apache::mod::cgi'] } From 1729c0e8a89e38756b37260519c4d4d1f46df153 Mon Sep 17 00:00:00 2001 From: Helen Campbell Date: Thu, 27 Oct 2016 12:04:37 +0100 Subject: [PATCH 3/3] Additional SLES fix for version fact --- manifests/version.pp | 3 +-- spec/classes/mod/ssl_spec.rb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/manifests/version.pp b/manifests/version.pp index 17092ac6bf..dbe67f7dc7 100644 --- a/manifests/version.pp +++ b/manifests/version.pp @@ -36,12 +36,11 @@ $default = '2.4' } 'Suse': { - if ($::operatingsystemmajrelease == '12') { + if $::operatingsystem == 'SLES' and $::operatingsystemrelease == '12' { $default = '2.4' } else { $default = '2.2' } - } default: { fail("Class['apache::version']: Unsupported osfamily: ${::osfamily}") diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb index 6b0d8def3e..f787496313 100644 --- a/spec/classes/mod/ssl_spec.rb +++ b/spec/classes/mod/ssl_spec.rb @@ -103,7 +103,7 @@ { :osfamily => 'Suse', :operatingsystem => 'SLES', - :operatingsystemrelease => '11.2', + :operatingsystemrelease => '12', :concat_basedir => '/dne', :id => 'root', :kernel => 'Linux',