| author | Patrick Einheber <patrick.einheber@oracle.com> |
| Wed, 27 Apr 2016 14:55:10 -0700 | |
| changeset 5860 | afd31ba91ee9 |
| parent 5696 | f99e26938556 |
| permissions | -rw-r--r-- |
|
4911
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
1 |
Patch to add Solaris to the list of OSes which use the 'prefork' |
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
2 |
version of mod-prefork. This patch has not yet been submitted upstream. |
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
3 |
|
|
5860
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
4 |
--- puppetlabs-apache-1.8.1/manifests/mod/prefork.pp.orig 2016-04-20 12:59:10.851657068 -0700 |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
5 |
+++ puppetlabs-apache-1.8.1/manifests/mod/prefork.pp 2016-04-20 12:59:35.452404762 -0700 |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
6 |
@@ -1,3 +1,7 @@ |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
7 |
+####################################################################### |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
8 |
+# Oracle has modified the originally distributed contents of this file. |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
9 |
+####################################################################### |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
10 |
+ |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
11 |
class apache::mod::prefork ( |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
12 |
$startservers = '8', |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
13 |
$minspareservers = '5', |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5696
diff
changeset
|
14 |
@@ -60,7 +64,7 @@ |
|
4911
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
15 |
} |
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
16 |
} |
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
17 |
} |
|
5696
f99e26938556
22992926 Update puppetlabs-apache to 1.8.1
Patrick Einheber <patrick.einheber@oracle.com>
parents:
4911
diff
changeset
|
18 |
- 'debian', 'freebsd', 'Suse' : {
|
|
f99e26938556
22992926 Update puppetlabs-apache to 1.8.1
Patrick Einheber <patrick.einheber@oracle.com>
parents:
4911
diff
changeset
|
19 |
+ 'debian', 'freebsd', 'Suse', 'solaris' : {
|
|
4911
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
20 |
::apache::mpm{ 'prefork':
|
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
21 |
apache_version => $apache_version, |
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
22 |
} |