components/ruby/puppet-modules/puppetlabs-apache/patches/03-version.patch
changeset 5860 afd31ba91ee9
parent 4911 6590570733a1
equal deleted inserted replaced
5859:98bc99958997 5860:afd31ba91ee9
     1 Patch to add which version of Apache is supported.  This patch has not
     1 Patch to add which version of Apache is supported.  This patch has not
     2 yet been submitted upstream.
     2 yet been submitted upstream.
     3 
     3 
     4 --- puppetlabs-apache-1.4.0/manifests/version.pp.orig	2015-06-03 13:37:11.442086477 -0600
     4 --- puppetlabs-apache-1.8.1/manifests/version.pp.orig	2016-02-09 08:50:27.000000000 -0800
     5 +++ puppetlabs-apache-1.4.0/manifests/version.pp	2015-06-03 13:37:33.305823825 -0600
     5 +++ puppetlabs-apache-1.8.1/manifests/version.pp	2016-04-20 12:56:54.113346691 -0700
     6 @@ -33,6 +33,9 @@ class apache::version {
     6 @@ -1,3 +1,7 @@
     7      'Gentoo': {
     7 +#######################################################################
     8        $default = '2.4'
     8 +# Oracle has modified the originally distributed contents of this file.
       
     9 +#######################################################################
       
    10 +
       
    11  # Class: apache::version
       
    12  #
       
    13  # Try to automatically detect the version by OS
       
    14 @@ -38,6 +42,9 @@
       
    15      'Suse': {
       
    16        $default = '2.2'
     9      }
    17      }
    10 +    'Solaris': {
    18 +    'Solaris': {
    11 +      $default = '2.4'
    19 +      $default = '2.4'
    12 +    }
    20 +    }
    13      default: {
    21      default: {