| author | Patrick Einheber <patrick.einheber@oracle.com> |
| Wed, 27 Apr 2016 14:55:10 -0700 | |
| changeset 5860 | afd31ba91ee9 |
| parent 5849 | 0f760c459790 |
| 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 specific elements to the main Apache |
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
2 |
configuration file. 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:
5849
diff
changeset
|
4 |
--- puppetlabs-apache-1.8.1/manifests/init.pp.orig 2016-04-27 07:52:17.681437269 -0700 |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5849
diff
changeset
|
5 |
+++ puppetlabs-apache-1.8.1/manifests/init.pp 2016-04-27 07:52:49.540772562 -0700 |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5849
diff
changeset
|
6 |
@@ -1,3 +1,7 @@ |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5849
diff
changeset
|
7 |
+####################################################################### |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5849
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:
5849
diff
changeset
|
9 |
+####################################################################### |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5849
diff
changeset
|
10 |
+ |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5849
diff
changeset
|
11 |
# Class: apache |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5849
diff
changeset
|
12 |
# |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5849
diff
changeset
|
13 |
# This class installs Apache |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5849
diff
changeset
|
14 |
@@ -305,6 +309,11 @@ |
|
5849
0f760c459790
23175725 apache 1.8.1 puppet module tries to redefine pidfile
Patrick Einheber <patrick.einheber@oracle.com>
parents:
4911
diff
changeset
|
15 |
$scriptalias = '/usr/lib/cgi-bin' |
|
0f760c459790
23175725 apache 1.8.1 puppet module tries to redefine pidfile
Patrick Einheber <patrick.einheber@oracle.com>
parents:
4911
diff
changeset
|
16 |
$access_log_file = 'access.log' |
|
4911
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
17 |
} |
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
18 |
+ 'solaris': {
|
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
19 |
+ $error_log = 'error_log' |
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
20 |
+ $scriptalias = '/var/apache2/2.4/cgi-bin/' |
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
21 |
+ $access_log_file = 'access_log' |
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
22 |
+ } |
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
23 |
default: {
|
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
24 |
fail("Unsupported osfamily ${::osfamily}")
|
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
25 |
} |