components/ruby/puppet-modules/puppetlabs-apache/patches/09-mod-ssl.patch
author Drew Fisher <drew.fisher@oracle.com>
Wed, 30 Mar 2016 10:16:56 -0700
changeset 5681 b8fe51f35344
child 5696 f99e26938556
permissions -rw-r--r--
22999085 apache puppet module doesn't support ssl on Solaris
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5681
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     1
Patch to add Solaris specific paths for mod-ssl.  This patch has not
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     2
yet been submitted upstream.
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     3
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     4
--- puppetlabs-apache-1.4.0/manifests/mod/ssl.pp.orig	Thu Mar 24 13:28:37 2016
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     5
+++ puppetlabs-apache-1.4.0/manifests/mod/ssl.pp	Thu Mar 24 14:38:48 2016
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     6
@@ -8,11 +8,28 @@
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     7
   $apache_version         = $::apache::apache_version,
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     8
   $package_name           = undef,
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     9
 ) {
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    10
-  $session_cache = $::osfamily ? {
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    11
-    'debian'  => "\${APACHE_RUN_DIR}/ssl_scache(512000)",
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    12
-    'redhat'  => '/var/cache/mod_ssl/scache(512000)',
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    13
-    'freebsd' => '/var/run/ssl_scache(512000)',
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    14
-    'gentoo'  => '/var/run/ssl_scache(512000)',
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    15
+  case $::osfamily {
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    16
+    'debian': {
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    17
+      $session_cache = "\${APACHE_RUN_DIR}/ssl_scache(512000)"
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    18
+    }
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    19
+    'redhat': {
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    20
+      $session_cache = '/var/cache/mod_ssl/scache(512000)'
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    21
+    }
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    22
+    'freebsd': {
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    23
+      $session_cache = '/var/run/ssl_scache(512000)'
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    24
+    }
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    25
+    'gentoo': {
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    26
+      $session_cache = '/var/run/ssl_scache(512000)'
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    27
+    }
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    28
+    'solaris': {
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    29
+      if versioncmp($apache_version, '2.4') == 0 {
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    30
+	$session_cache = '/var/run/apache2/2.4/ssl_scache(512000)'
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    31
+      } elsif versioncmp($apache_version, '2.2') == 0 {
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    32
+	$session_cache = '/var/run/apache2/2.2/ssl_scache(512000)'
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    33
+      } else {
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    34
+	$session_cache = '/var/run/ssl_scache(512000)'
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    35
+      }
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    36
+    }
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    37
   }
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    38
 
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    39
   case $::osfamily {
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    40
@@ -34,6 +51,15 @@
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    41
     'gentoo': {
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    42
       $ssl_mutex = 'default'
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    43
     }
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    44
+    'solaris': {
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    45
+      if versioncmp($apache_version, '2.4') == 0 {
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    46
+        $ssl_mutex = 'default'
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    47
+      } elsif versioncmp($apache_version, '2.2') == 0 {
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    48
+        $ssl_mutex = 'file:/var/run/apache2/2.2/ssl_mutex'
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    49
+      } else {
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    50
+        $ssl_mutex = "file:/var/run/ssl_mutex"
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    51
+      }
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    52
+    }
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    53
     default: {
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    54
       fail("Unsupported osfamily ${::osfamily}")
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    55
     }
b8fe51f35344 22999085 apache puppet module doesn't support ssl on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    56