components/ruby/puppet-modules/puppetlabs-apache/patches/09-mod-ssl.patch
branchs11u3-sru
changeset 6035 c9748fcc32de
equal deleted inserted replaced
6016:a477397bba8b 6035:c9748fcc32de
       
     1 Patch to add Solaris specific paths for mod-ssl.  This patch has not
       
     2 yet been submitted upstream.
       
     3 
       
     4 --- puppetlabs-apache-1.8.1/manifests/mod/ssl.pp.orig   2016-03-31 11:38:48.810710927 -0700
       
     5 +++ puppetlabs-apache-1.8.1/manifests/mod/ssl.pp        2016-03-31 11:40:38.688179788 -0700
       
     6 @@ -40,12 +40,31 @@
       
     7      }
       
     8    }
       
     9 
       
    10 -  $session_cache = $::osfamily ? {
       
    11 -    'debian'  => "\${APACHE_RUN_DIR}/ssl_scache(512000)",
       
    12 -    'redhat'  => '/var/cache/mod_ssl/scache(512000)',
       
    13 -    'freebsd' => '/var/run/ssl_scache(512000)',
       
    14 -    'gentoo'  => '/var/run/ssl_scache(512000)',
       
    15 -    'Suse'    => '/var/lib/apache2/ssl_scache(512000)'
       
    16 +  case $::osfamily {
       
    17 +    'debian': {
       
    18 +      $session_cache = "\${APACHE_RUN_DIR}/ssl_scache(512000)"
       
    19 +    }
       
    20 +    'redhat': {
       
    21 +      $session_cache = '/var/cache/mod_ssl/scache(512000)'
       
    22 +    }
       
    23 +    'freebsd': {
       
    24 +      $session_cache = '/var/run/ssl_scache(512000)'
       
    25 +    }
       
    26 +    'gentoo': {
       
    27 +      $session_cache = '/var/run/ssl_scache(512000)'
       
    28 +    }
       
    29 +    'Suse': {
       
    30 +      $session_cache = '/var/lib/apache2/ssl_scache(512000)'
       
    31 +    }
       
    32 +    'solaris': {
       
    33 +      if versioncmp($apache_version, '2.4') == 0 {
       
    34 +       $session_cache = '/var/run/apache2/2.4/ssl_scache(512000)'
       
    35 +      } elsif versioncmp($apache_version, '2.2') == 0 {
       
    36 +       $session_cache = '/var/run/apache2/2.2/ssl_scache(512000)'
       
    37 +      } else {
       
    38 +       $session_cache = '/var/run/ssl_scache(512000)'
       
    39 +      }
       
    40 +    }
       
    41    }
       
    42 
       
    43    ::apache::mod { 'ssl':
       
    44