| author | Drew Fisher <drew.fisher@oracle.com> |
| Thu, 01 Oct 2015 15:00:59 -0700 | |
| changeset 4911 | 6590570733a1 |
| child 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 |
|
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
4 |
--- puppetlabs-apache-1.4.0/manifests/init.pp.orig 2015-06-03 13:46:16.375098644 -0600 |
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
5 |
+++ puppetlabs-apache-1.4.0/manifests/init.pp 2015-06-03 13:46:39.983927244 -0600 |
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
6 |
@@ -281,6 +281,12 @@ class apache ( |
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
7 |
require => Package['httpd'], |
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
8 |
} |
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
9 |
} |
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
10 |
+ 'solaris': {
|
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
11 |
+ $pidfile = '/system/volatile/apache2/2.4/httpd.pid' |
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
12 |
+ $error_log = 'error_log' |
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
13 |
+ $scriptalias = '/var/apache2/2.4/cgi-bin/' |
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
14 |
+ $access_log_file = 'access_log' |
|
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 |
default: {
|
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
17 |
fail("Unsupported osfamily ${::osfamily}")
|
|
6590570733a1
PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
18 |
} |