components/ruby/puppet-modules/puppetlabs-apache/patches/02-params.patch
author Drew Fisher <drew.fisher@oracle.com>
Thu, 01 Oct 2015 15:00:59 -0700
changeset 4911 6590570733a1
child 5696 f99e26938556
permissions -rw-r--r--
PSARC/2015/368 Common Puppet Modules 21691386 Request to integrate common puppet modules into Userland
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4911
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     1
Patch to add Solaris support.  This patch configures things like pkg5
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     2
names, SMF services, filesystem locations, etc.
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
This patch has not yet been submitted upstream.
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     5
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     6
--- puppetlabs-apache-1.4.0/manifests/params.pp.orig	2015-05-27 11:04:52.423946815 -0600
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     7
+++ puppetlabs-apache-1.4.0/manifests/params.pp	2015-05-27 13:45:14.205705497 -0600
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     8
@@ -416,6 +416,65 @@ class apache::params inherits ::apache::
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     9
     $wsgi_socket_prefix   = undef
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    10
     $docroot              = '/var/www/localhost/htdocs'
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    11
     $error_documents_path = '/usr/share/apache2/error'
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    12
+  } elsif $::osfamily == 'Solaris' {
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    13
+    $user                = 'webservd'
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    14
+    $group               = 'webservd'
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    15
+    $root_group          = 'root'
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    16
+    $apache_name         = 'web/server/apache-24'
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    17
+    $service_name        = 'network/http:apache24'
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    18
+    $httpd_dir           = '/etc/apache2/2.4'
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    19
+    $server_root         = '/usr/apache2/2.4'
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    20
+    $conf_dir            = $httpd_dir
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    21
+    $confd_dir           = "${httpd_dir}/conf.d"
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    22
+    $mod_dir             = "${httpd_dir}/conf.d"
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    23
+    $mod_enable_dir      = undef
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    24
+    $vhost_dir           = "${httpd_dir}/conf.d"
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    25
+    $vhost_enable_dir    = undef
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    26
+    $conf_file           = 'httpd.conf'
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    27
+    $ports_file          = "${conf_dir}/ports.conf"
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    28
+    $logroot             = '/var/apache2/2.4/logs'
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    29
+    $logroot_mode        = undef
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    30
+    $lib_path            = '/usr/apache2/2.4/libexec'
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    31
+    $mpm_module          = 'prefork'
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    32
+    $default_ssl_cert    = undef
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    33
+    $default_ssl_key     = undef
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    34
+    $ssl_certs_dir       = '/etc/certs'
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    35
+    $suphp_addhandler    = undef
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    36
+    $suphp_engine        = off
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    37
+    $suphp_configpath    = undef
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    38
+    $mod_packages        = {
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    39
+      'dbd'           => 'web/server/apache-24/module/apache-dbd',
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    40
+      'dtrace'        => 'web/server/apache-24/module/apache-dtrace',
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    41
+      'fcgid'         => 'web/server/apache-24/module/apache-fcgid',
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    42
+      'gss'           => 'web/server/apache-24/module/apache-gss',
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    43
+      'jk'            => 'web/server/apache-24/module/apache-jk',
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    44
+      'ldap'          => 'web/server/apache-24/module/apache-ldap',
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    45
+      'lua'           => 'web/server/apache-24/module/apache-lua',
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    46
+      'security'      => 'web/server/apache-24/module/apache-security',
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    47
+      'ssl-fips-140'  => 'web/server/apache-24/module/apache-ssl-fips-140',
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    48
+      'ssl'           => 'web/server/apache-24/module/apache-ssl',
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    49
+      'wsgi-26'       => 'web/server/apache-24/module/apache-wsgi-26',
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    50
+      'wsgi-27'       => 'web/server/apache-24/module/apache-wsgi-27',
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    51
+      'wsgi-34'       => 'web/server/apache-24/module/apache-wsgi-34',
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    52
+    }
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    53
+    $mod_libs             = {
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    54
+      'php5' => 'libphp5.so',
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    55
+    }
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    56
+    $conf_template          = 'apache/httpd.conf.erb'
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    57
+    $keepalive              = 'Off'
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    58
+    $keepalive_timeout      = 15
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    59
+    $max_keepalive_requests = 100
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    60
+    $fastcgi_lib_path       = '/var/apache2/2.4/htdocs/fcgid'
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    61
+    $mime_support_package   = 'system/core-os'
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    62
+    $mime_types_config      = '/etc/mime.types'
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    63
+    $docroot                = '/var/apache2/2.4/htdocs'
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    64
+    $cas_cookie_path        = undef
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    65
+    $modsec_crs_package     = undef
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    66
+    $modsec_crs_path        = undef
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    67
+    $modsec_dir             = undef
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    68
+    $modsec_default_rules   = undef
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    69
+    $error_documents_path   = '/var/apache2/2.4/error'
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    70
+    $wsgi_socket_prefix     = undef
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    71
   } else {
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    72
     fail("Class['apache::params']: Unsupported osfamily: ${::osfamily}")
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    73
   }