Merge remote-tracking branch 'upstream/master'

typhonius · Feb 28, 2014 · dbc1bd4 · dbc1bd4
2 parents 4f3f889 + b499aa2
commit dbc1bd4
Show file tree

Hide file tree

Showing 131 changed files with 2,515 additions and 1,488 deletions.
diff --git a/.puppet-lint.rc b/.puppet-lint.rc
@@ -0,0 +1,5 @@
+--no-single_quote_string_with_variables-check
+--no-80chars-check
+--no-class_inherits_from_params_class-check
+--no-class_parameter_defaults-check
+--no-documentation-check
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,40 @@
+## 2014-01-31 Release 0.11.0
+### Summary:
+
+This release adds preliminary support for Windows compatibility and multiple rewrite support.
+
+### Backwards-incompatible Changes:
+
+- The rewrite_rule parameter is deprecated in favor of the new rewrite parameter
+  and will be removed in a future release.
+
+### Features:
+
+- add Match directive
+- quote paths for windows compatibility
+- add auth_group_file option to README.md
+- allow AuthGroupFile directive for vhosts
+- Support Header directives in vhost context
+- Don't purge mods-available dir when separate enable dir is used
+- Fix the servername used in log file name
+- Added support for mod_include
+- Remove index parameters.
+- Support environment variable control for CustomLog
+- added redirectmatch support
+- Setting up the ability to do multiple rewrites and conditions.
+- Convert spec tests to beaker.
+- Support php_admin_(flag|value)s
+
+### Bugfixes:
+
+- directories are either a Hash or an Array of Hashes
+- Configure Passenger in separate .conf file on RH so PassengerRoot isn't lost
+- (docs) Update list of `apache::mod::[name]` classes
+- (docs) Fix apache::namevirtualhost example call style
+- Fix $ports_file reference in apache::listen.
+- Fix $ports_file reference in Namevirtualhost.
+
+
 ## 2013-12-05 Release 0.10.0
 ### Summary:
 

diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :test do
   gem 'rake',                    :require => false

diff --git a/Modulefile b/Modulefile
@@ -1,5 +1,5 @@
 name 'puppetlabs-apache'
-version '0.10.0'
+version '0.11.0'
 source 'git://github.com/puppetlabs/puppetlabs-apache.git'
 author 'puppetlabs'
 license 'Apache 2.0'

diff --git a/README.md b/README.md
diff --git a/README.passenger.md b/README.passenger.md
@@ -49,13 +49,13 @@ Sets how often Passenger performs file system checks, at most once every _x_ sec
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_passengerstatthrottlerate_lt_integer_gt
 
-## rack_auto_detect
+## rack_autodetect
 
 Should Passenger automatically detect if the document root of a virtual host is a Rack application. The default is `on`
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_rackautodetect_lt_on_off_gt
 
-## rails_auto_detect
+## rails_autodetect
 
 Should Passenger automatically detect if the document root of a virtual host is a Rails application. The default is on.
 

diff --git a/Rakefile b/Rakefile
@@ -6,4 +6,5 @@ PuppetLint.configuration.send('disable_80chars')
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')
 PuppetLint.configuration.send('disable_class_parameter_defaults')
 PuppetLint.configuration.send('disable_documentation')
+PuppetLint.configuration.send('disable_single_quote_string_with_variables')
 PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
diff --git a/manifests/balancer.pp b/manifests/balancer.pp
@@ -43,7 +43,7 @@
   $collect_exported = true,
 ) {
   include concat::setup
-  include apache::mod::proxy_balancer
+  include ::apache::mod::proxy_balancer
 
   $target = "${::apache::params::confd_dir}/balancer_${name}.conf"
 

diff --git a/manifests/confd/no_accf.pp b/manifests/confd/no_accf.pp
@@ -2,9 +2,9 @@
   # Template uses no variables
   file { 'no-accf.conf':
     ensure  => 'file',
-    path    => "${apache::confd_dir}/no-accf.conf",
+    path    => "${::apache::confd_dir}/no-accf.conf",
     content => template('apache/confd/no-accf.conf.erb'),
-    require => Exec["mkdir ${apache::confd_dir}"],
-    before  => File[$apache::confd_dir],
+    require => Exec["mkdir ${::apache::confd_dir}"],
+    before  => File[$::apache::confd_dir],
   }
 }
diff --git a/manifests/default_confd_files.pp b/manifests/default_confd_files.pp
@@ -5,7 +5,7 @@
   if $all {
     case $::osfamily {
       'freebsd': {
-        include apache::confd::no_accf
+        include ::apache::confd::no_accf
       }
       default: {
         # do nothing

diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
@@ -1,111 +1,154 @@
 class apache::default_mods (
-  $all  = true,
-  $mods = undef,
+  $all            = true,
+  $mods           = undef,
+  $apache_version = $::apache::apache_version
 ) {
   # These are modules required to run the default configuration.
   # They are not configurable at this time, so we just include
   # them to make sure it works.
   case $::osfamily {
     'redhat', 'freebsd': {
-      apache::mod { 'log_config': }
+      ::apache::mod { 'log_config': }
     }
     default: {}
   }
-  apache::mod { 'authz_host': }
+  ::apache::mod { 'authz_host': }
 
   # The rest of the modules only get loaded if we want all modules enabled
   if $all {
     case $::osfamily {
       'debian': {
-        include apache::mod::reqtimeout
+        include ::apache::mod::reqtimeout
       }
       'redhat': {
-        include apache::mod::cache
-        include apache::mod::mime
-        include apache::mod::mime_magic
-        include apache::mod::vhost_alias
-        include apache::mod::rewrite
-        apache::mod { 'actions': }
-        apache::mod { 'auth_digest': }
-        apache::mod { 'authn_alias': }
-        apache::mod { 'authn_anon': }
-        apache::mod { 'authn_dbm': }
-        apache::mod { 'authn_default': }
-        apache::mod { 'authz_dbm': }
-        apache::mod { 'authz_owner': }
-        apache::mod { 'expires': }
-        apache::mod { 'ext_filter': }
-        apache::mod { 'include': }
-        apache::mod { 'logio': }
-        apache::mod { 'speling': }
-        apache::mod { 'substitute': }
-        apache::mod { 'suexec': }
-        apache::mod { 'usertrack': }
-        apache::mod { 'version': }
+        include ::apache::mod::cache
+        include ::apache::mod::mime
+        include ::apache::mod::mime_magic
+        include ::apache::mod::vhost_alias
+        include ::apache::mod::rewrite
+        ::apache::mod { 'actions': }
+        ::apache::mod { 'auth_digest': }
+        ::apache::mod { 'authn_anon': }
+        ::apache::mod { 'authn_dbm': }
+        ::apache::mod { 'authz_dbm': }
+        ::apache::mod { 'authz_owner': }
+        ::apache::mod { 'expires': }
+        ::apache::mod { 'ext_filter': }
+        ::apache::mod { 'include': }
+        ::apache::mod { 'logio': }
+        ::apache::mod { 'speling': }
+        ::apache::mod { 'substitute': }
+        ::apache::mod { 'suexec': }
+        ::apache::mod { 'usertrack': }
+        ::apache::mod { 'version': }
+
+        if $apache_version >= 2.4 {
+          # Lets fork it
+          ::apache::mod { 'systemd': }
+
+          ::apache::mod { 'unixd': }
+          ::apache::mod { 'authn_core': }
+        }
+        else {
+          ::apache::mod { 'authn_alias': }
+          ::apache::mod { 'authn_default': }
+        }
       }
       'freebsd': {
-        include apache::mod::cache
-        include apache::mod::disk_cache
-        include apache::mod::headers
-        include apache::mod::info
-        include apache::mod::mime_magic
-        include apache::mod::reqtimeout
-        include apache::mod::rewrite
-        include apache::mod::userdir
-        include apache::mod::vhost_alias
+        include ::apache::mod::cache
+        include ::apache::mod::disk_cache
+        include ::apache::mod::headers
+        include ::apache::mod::info
+        include ::apache::mod::mime_magic
+        include ::apache::mod::reqtimeout
+        include ::apache::mod::rewrite
+        include ::apache::mod::userdir
+        include ::apache::mod::vhost_alias
 
-        apache::mod { 'actions': }
-        apache::mod { 'asis': }
-        apache::mod { 'auth_digest': }
-        apache::mod { 'authn_alias': }
-        apache::mod { 'authn_anon': }
-        apache::mod { 'authn_dbm': }
-        apache::mod { 'authn_default': }
-        apache::mod { 'authz_dbm': }
-        apache::mod { 'authz_owner': }
-        apache::mod { 'cern_meta': }
-        apache::mod { 'charset_lite': }
-        apache::mod { 'dumpio': }
-        apache::mod { 'expires': }
-        apache::mod { 'file_cache': }
-        apache::mod { 'filter':}
-        apache::mod { 'imagemap':}
-        apache::mod { 'include': }
-        apache::mod { 'logio': }
-        apache::mod { 'speling': }
-        apache::mod { 'unique_id': }
-        apache::mod { 'usertrack': }
-        apache::mod { 'version': }
+        ::apache::mod { 'actions': }
+        ::apache::mod { 'asis': }
+        ::apache::mod { 'auth_digest': }
+        ::apache::mod { 'authn_alias': }
+        ::apache::mod { 'authn_anon': }
+        ::apache::mod { 'authn_dbm': }
+        ::apache::mod { 'authn_default': }
+        ::apache::mod { 'authz_dbm': }
+        ::apache::mod { 'authz_owner': }
+        ::apache::mod { 'cern_meta': }
+        ::apache::mod { 'charset_lite': }
+        ::apache::mod { 'dumpio': }
+        ::apache::mod { 'expires': }
+        ::apache::mod { 'file_cache': }
+        ::apache::mod { 'filter':}
+        ::apache::mod { 'imagemap':}
+        ::apache::mod { 'include': }
+        ::apache::mod { 'logio': }
+        ::apache::mod { 'speling': }
+        ::apache::mod { 'unique_id': }
+        ::apache::mod { 'usertrack': }
+        ::apache::mod { 'version': }
       }
       default: {}
     }
-    case $apache::mpm_module {
+    case $::apache::mpm_module {
       'prefork': {
-        include apache::mod::cgi
+        include ::apache::mod::cgi
       }
       'worker': {
-        include apache::mod::cgid
+        include ::apache::mod::cgid
       }
       default: {
         # do nothing
       }
     }
-    include apache::mod::alias
-    include apache::mod::autoindex
-    include apache::mod::dav
-    include apache::mod::dav_fs
-    include apache::mod::deflate
-    include apache::mod::dir
-    include apache::mod::mime
-    include apache::mod::negotiation
-    include apache::mod::setenvif
-    apache::mod { 'auth_basic': }
-    apache::mod { 'authn_file': }
-    apache::mod { 'authz_default': }
-    apache::mod { 'authz_groupfile': }
-    apache::mod { 'authz_user': }
-    apache::mod { 'env': }
+    include ::apache::mod::alias
+    include ::apache::mod::autoindex
+    include ::apache::mod::dav
+    include ::apache::mod::dav_fs
+    include ::apache::mod::deflate
+    include ::apache::mod::dir
+    include ::apache::mod::mime
+    include ::apache::mod::negotiation
+    include ::apache::mod::setenvif
+    ::apache::mod { 'auth_basic': }
+    ::apache::mod { 'authn_file': }
+
+    if $apache_version >= 2.4 {
+      # authz_core is needed for 'Require' directive
+      ::apache::mod { 'authz_core':
+        id => 'authz_core_module',
+      }
+
+      # filter is needed by mod_deflate
+      ::apache::mod { 'filter': }
+    } else {
+      ::apache::mod { 'authz_default': }
+    }
+
+    ::apache::mod { 'authz_groupfile': }
+    ::apache::mod { 'authz_user': }
+    ::apache::mod { 'env': }
   } elsif $mods {
-    apache::default_mods::load { $mods: }
+    ::apache::default_mods::load { $mods: }
+
+    if $apache_version >= 2.4 {
+      # authz_core is needed for 'Require' directive
+      ::apache::mod { 'authz_core':
+        id => 'authz_core_module',
+      }
+
+      # filter is needed by mod_deflate
+      ::apache::mod { 'filter': }
+    }
+  } else {
+    if $apache_version >= 2.4 {
+      # authz_core is needed for 'Require' directive
+      ::apache::mod { 'authz_core':
+        id => 'authz_core_module',
+      }
+
+      # filter is needed by mod_deflate
+      ::apache::mod { 'filter': }
+    }
   }
 }
diff --git a/manifests/default_mods/load.pp b/manifests/default_mods/load.pp
@@ -1,8 +1,8 @@
 # private define
 define apache::default_mods::load ($module = $title) {
   if defined("apache::mod::${module}") {
-    include "apache::mod::${module}"
+    include "::apache::mod::${module}"
   } else {
-    apache::mod { $module: }
+    ::apache::mod { $module: }
   }
 }
diff --git a/manifests/dev.pp b/manifests/dev.pp
@@ -2,8 +2,8 @@
   if $::osfamily == 'FreeBSD' and !defined(Class['apache::package']) {
     fail('apache::dev requires apache::package; please include apache or apache::package class first')
   }
-  include apache::params
-  $packages = $apache::params::dev_packages
+  include ::apache::params
+  $packages = $::apache::params::dev_packages
   package { $packages:
     ensure  => present,
     require => Package['httpd'],