22999085 apache puppet module doesn't support ssl on Solaris
authorDrew Fisher <drew.fisher@oracle.com>
Wed, 30 Mar 2016 10:16:56 -0700
changeset 5681 b8fe51f35344
parent 5680 6442bdaae1d9
child 5682 94c0ca64c022
22999085 apache puppet module doesn't support ssl on Solaris
components/ruby/puppet-modules/puppetlabs-apache/patches/09-mod-ssl.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/puppetlabs-apache/patches/09-mod-ssl.patch	Wed Mar 30 10:16:56 2016 -0700
@@ -0,0 +1,56 @@
+Patch to add Solaris specific paths for mod-ssl.  This patch has not
+yet been submitted upstream.
+
+--- puppetlabs-apache-1.4.0/manifests/mod/ssl.pp.orig	Thu Mar 24 13:28:37 2016
++++ puppetlabs-apache-1.4.0/manifests/mod/ssl.pp	Thu Mar 24 14:38:48 2016
[email protected]@ -8,11 +8,28 @@
+   $apache_version         = $::apache::apache_version,
+   $package_name           = undef,
+ ) {
+-  $session_cache = $::osfamily ? {
+-    'debian'  => "\${APACHE_RUN_DIR}/ssl_scache(512000)",
+-    'redhat'  => '/var/cache/mod_ssl/scache(512000)',
+-    'freebsd' => '/var/run/ssl_scache(512000)',
+-    'gentoo'  => '/var/run/ssl_scache(512000)',
++  case $::osfamily {
++    'debian': {
++      $session_cache = "\${APACHE_RUN_DIR}/ssl_scache(512000)"
++    }
++    'redhat': {
++      $session_cache = '/var/cache/mod_ssl/scache(512000)'
++    }
++    'freebsd': {
++      $session_cache = '/var/run/ssl_scache(512000)'
++    }
++    'gentoo': {
++      $session_cache = '/var/run/ssl_scache(512000)'
++    }
++    'solaris': {
++      if versioncmp($apache_version, '2.4') == 0 {
++	$session_cache = '/var/run/apache2/2.4/ssl_scache(512000)'
++      } elsif versioncmp($apache_version, '2.2') == 0 {
++	$session_cache = '/var/run/apache2/2.2/ssl_scache(512000)'
++      } else {
++	$session_cache = '/var/run/ssl_scache(512000)'
++      }
++    }
+   }
+ 
+   case $::osfamily {
[email protected]@ -34,6 +51,15 @@
+     'gentoo': {
+       $ssl_mutex = 'default'
+     }
++    'solaris': {
++      if versioncmp($apache_version, '2.4') == 0 {
++        $ssl_mutex = 'default'
++      } elsif versioncmp($apache_version, '2.2') == 0 {
++        $ssl_mutex = 'file:/var/run/apache2/2.2/ssl_mutex'
++      } else {
++        $ssl_mutex = "file:/var/run/ssl_mutex"
++      }
++    }
+     default: {
+       fail("Unsupported osfamily ${::osfamily}")
+     }
+