| author | Patrick Einheber <patrick.einheber@oracle.com> |
| Tue, 26 Apr 2016 14:10:22 -0700 | |
| changeset 5850 | cf101610be7c |
| parent 5696 | f99e26938556 |
| child 5860 | afd31ba91ee9 |
| permissions | -rw-r--r-- |
|
5681
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
1 |
Patch to add Solaris specific paths for mod-ssl. This patch has not |
|
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
2 |
yet been submitted upstream. |
|
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
3 |
|
|
5850
cf101610be7c
23175796 upgrade to apache 1.8.1 puppet module disabled ssl support again
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
4 |
--- puppetlabs-apache-1.8.1/manifests/mod/ssl.pp.orig 2016-04-25 12:42:50.344060420 -0700 |
|
cf101610be7c
23175796 upgrade to apache 1.8.1 puppet module disabled ssl support again
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
5 |
+++ puppetlabs-apache-1.8.1/manifests/mod/ssl.pp 2016-04-25 12:48:12.151380956 -0700 |
|
cf101610be7c
23175796 upgrade to apache 1.8.1 puppet module disabled ssl support again
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
6 |
@@ -32,6 +32,15 @@ |
|
cf101610be7c
23175796 upgrade to apache 1.8.1 puppet module disabled ssl support again
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
7 |
'gentoo': {
|
|
cf101610be7c
23175796 upgrade to apache 1.8.1 puppet module disabled ssl support again
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
8 |
$ssl_mutex = 'default' |
|
cf101610be7c
23175796 upgrade to apache 1.8.1 puppet module disabled ssl support again
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
9 |
} |
|
cf101610be7c
23175796 upgrade to apache 1.8.1 puppet module disabled ssl support again
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
10 |
+ 'solaris': {
|
|
cf101610be7c
23175796 upgrade to apache 1.8.1 puppet module disabled ssl support again
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
11 |
+ if versioncmp($apache_version, '2.4') == 0 {
|
|
cf101610be7c
23175796 upgrade to apache 1.8.1 puppet module disabled ssl support again
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
12 |
+ $ssl_mutex = 'default' |
|
cf101610be7c
23175796 upgrade to apache 1.8.1 puppet module disabled ssl support again
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
13 |
+ } elsif versioncmp($apache_version, '2.2') == 0 {
|
|
cf101610be7c
23175796 upgrade to apache 1.8.1 puppet module disabled ssl support again
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
14 |
+ $ssl_mutex = 'file:/var/run/apache2/2.2/ssl_mutex' |
|
cf101610be7c
23175796 upgrade to apache 1.8.1 puppet module disabled ssl support again
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
15 |
+ } else {
|
|
cf101610be7c
23175796 upgrade to apache 1.8.1 puppet module disabled ssl support again
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
16 |
+ $ssl_mutex = "file:/var/run/ssl_mutex" |
|
cf101610be7c
23175796 upgrade to apache 1.8.1 puppet module disabled ssl support again
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
17 |
+ } |
|
cf101610be7c
23175796 upgrade to apache 1.8.1 puppet module disabled ssl support again
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
18 |
+ } |
|
cf101610be7c
23175796 upgrade to apache 1.8.1 puppet module disabled ssl support again
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
19 |
'Suse': {
|
|
cf101610be7c
23175796 upgrade to apache 1.8.1 puppet module disabled ssl support again
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
20 |
$ssl_mutex = 'default' |
|
cf101610be7c
23175796 upgrade to apache 1.8.1 puppet module disabled ssl support again
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
21 |
} |
|
cf101610be7c
23175796 upgrade to apache 1.8.1 puppet module disabled ssl support again
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
22 |
@@ -40,12 +49,31 @@ |
|
5696
f99e26938556
22992926 Update puppetlabs-apache to 1.8.1
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5681
diff
changeset
|
23 |
} |
|
f99e26938556
22992926 Update puppetlabs-apache to 1.8.1
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5681
diff
changeset
|
24 |
} |
|
5850
cf101610be7c
23175796 upgrade to apache 1.8.1 puppet module disabled ssl support again
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
25 |
|
|
5681
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
26 |
- $session_cache = $::osfamily ? {
|
|
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
27 |
- 'debian' => "\${APACHE_RUN_DIR}/ssl_scache(512000)",
|
|
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
28 |
- 'redhat' => '/var/cache/mod_ssl/scache(512000)', |
|
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
29 |
- 'freebsd' => '/var/run/ssl_scache(512000)', |
|
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
30 |
- 'gentoo' => '/var/run/ssl_scache(512000)', |
|
5696
f99e26938556
22992926 Update puppetlabs-apache to 1.8.1
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5681
diff
changeset
|
31 |
- 'Suse' => '/var/lib/apache2/ssl_scache(512000)' |
|
5681
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
32 |
+ case $::osfamily {
|
|
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
33 |
+ 'debian': {
|
|
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
34 |
+ $session_cache = "\${APACHE_RUN_DIR}/ssl_scache(512000)"
|
|
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
35 |
+ } |
|
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
36 |
+ 'redhat': {
|
|
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
37 |
+ $session_cache = '/var/cache/mod_ssl/scache(512000)' |
|
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
38 |
+ } |
|
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
39 |
+ 'freebsd': {
|
|
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
40 |
+ $session_cache = '/var/run/ssl_scache(512000)' |
|
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
41 |
+ } |
|
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
42 |
+ 'gentoo': {
|
|
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
43 |
+ $session_cache = '/var/run/ssl_scache(512000)' |
|
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
44 |
+ } |
|
5696
f99e26938556
22992926 Update puppetlabs-apache to 1.8.1
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5681
diff
changeset
|
45 |
+ 'Suse': {
|
|
f99e26938556
22992926 Update puppetlabs-apache to 1.8.1
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5681
diff
changeset
|
46 |
+ $session_cache = '/var/lib/apache2/ssl_scache(512000)' |
|
f99e26938556
22992926 Update puppetlabs-apache to 1.8.1
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5681
diff
changeset
|
47 |
+ } |
|
5681
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
48 |
+ 'solaris': {
|
|
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
49 |
+ if versioncmp($apache_version, '2.4') == 0 {
|
|
5696
f99e26938556
22992926 Update puppetlabs-apache to 1.8.1
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5681
diff
changeset
|
50 |
+ $session_cache = '/var/run/apache2/2.4/ssl_scache(512000)' |
|
5681
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
51 |
+ } elsif versioncmp($apache_version, '2.2') == 0 {
|
|
5696
f99e26938556
22992926 Update puppetlabs-apache to 1.8.1
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5681
diff
changeset
|
52 |
+ $session_cache = '/var/run/apache2/2.2/ssl_scache(512000)' |
|
5681
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
53 |
+ } else {
|
|
5696
f99e26938556
22992926 Update puppetlabs-apache to 1.8.1
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5681
diff
changeset
|
54 |
+ $session_cache = '/var/run/ssl_scache(512000)' |
|
5681
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
55 |
+ } |
|
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
56 |
+ } |
|
b8fe51f35344
22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
57 |
} |
|
5850
cf101610be7c
23175796 upgrade to apache 1.8.1 puppet module disabled ssl support again
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
58 |
|
|
5696
f99e26938556
22992926 Update puppetlabs-apache to 1.8.1
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5681
diff
changeset
|
59 |
::apache::mod { 'ssl':
|