equal
deleted
inserted
replaced
1 Patch to add Solaris specific elements to the main Apache |
1 Patch to add Solaris specific elements to the main Apache |
2 configuration file. This patch has not yet been submitted upstream. |
2 configuration file. This patch has not yet been submitted upstream. |
3 |
3 |
4 --- puppetlabs-apache-1.4.0/manifests/init.pp.orig 2015-06-03 13:46:16.375098644 -0600 |
4 --- puppetlabs-apache-1.8.1/manifests/init.pp.orig 2016-02-09 08:53:22.000000000 -0800 |
5 +++ puppetlabs-apache-1.4.0/manifests/init.pp 2015-06-03 13:46:39.983927244 -0600 |
5 +++ puppetlabs-apache-1.8.1/manifests/init.pp 2016-04-26 09:36:14.315166408 -0700 |
6 @@ -281,6 +281,12 @@ class apache ( |
6 @@ -305,6 +305,11 @@ |
7 require => Package['httpd'], |
7 $scriptalias = '/usr/lib/cgi-bin' |
8 } |
8 $access_log_file = 'access.log' |
9 } |
9 } |
10 + 'solaris': { |
10 + 'solaris': { |
11 + $pidfile = '/system/volatile/apache2/2.4/httpd.pid' |
|
12 + $error_log = 'error_log' |
11 + $error_log = 'error_log' |
13 + $scriptalias = '/var/apache2/2.4/cgi-bin/' |
12 + $scriptalias = '/var/apache2/2.4/cgi-bin/' |
14 + $access_log_file = 'access_log' |
13 + $access_log_file = 'access_log' |
15 + } |
14 + } |
16 default: { |
15 default: { |