Update apache to 1417312

1417312 Merge pull request #956 from cmurphy/master
e079dc8 Add json gem
4bf9de7 Update .travis.yml, Gemfile, Rakefile, and CONTRIBUTING.md
fee6749 Merge pull request #947 from justinstoller/maint/master/fix-lint
8f89cae Fix uninitialized variable lint
4c996a2 Merge pull request #946 from justinstoller/maint/master/geppetto-update
66036dd Update for using Geppetto plugin in CI
535ac43 Merge pull request #944 from valeriominetti/modules-825-mod_itk-fix
5efcdcd MODULES-825:  apache 2.4  mod_itk needs mod_prefork
004ed86 Merge pull request #942 from laurenrother/summary
d833c3e Fix MODULES-1510
2bae808 Add metadata summary per FM-1523
8a09b36 Merge pull request #939 from stumped2/feature/master/mpm_event
7f36d4b Merge pull request #934 from muresan/patch-1
468647c Add basic mpm_event docs, fix formatting, appease older ruby
5ac2f34 Add configurable options for mpm_event
1ff81aa Merge pull request #935 from mhaskel/MODULES-1403
79d43eb Merge pull request #936 from mhaskel/MODULES-1384
6d100c8 MODULES-1384 - idempotency for wsgi_script_aliases
a767f15 MODULES-1403 - fix doc bug
8d22b80 Updated _directories.erb to add support for 'SetEnv'
e559e7b Merge pull request #933 from mhaskel/remove_unused_template
a425c28 We should get rid of unused templates
7e63b00 Merge pull request #931 from tOnI0/master
fdd960a 'allow_encoded_slashes' was omitted
3b59c2c Merge pull request #929 from mhaskel/merge_1.2.x
af87074 Merge pull request #930 from enekogb/status_path
a51bfa8 Add $status_path parameter to change mod_status url
91588f0 Merge remote-tracking branch 'upstream/1.2.x' into merge_1.2.x
173967a Merge pull request #927 from mhaskel/1.2.0-prep
ef71aa9 1.2.0 prep
075f315 Merge pull request #926 from mhaskel/1.2.x_from_master
d75e4d3 Fix unit test failures with ruby 1.8.7
87be490 add spec test for (default) docroot directory
6330c89 add documentation for `docroot` (in init)
c5a9ec2 Add support for specifying the docroot option for RHEL SCL httpd24
692fabc add sort to LogFormats to ensure consistency between runs
1823dc2 Update the test to match the fix from yesterday
6790eec Fixes indentation of versioncmp
4e86abe Relying on missing fact
1f531b3 MODULES-1446: mod_version is now builtin
dda1b80 Update metadata
dcd8051 wsgi_chunked_request doesn't work on lucid
379f7a5 Satisfy doesn't work with apache 2.4
b1b7689 Linting and adding some tests
92c6c9a Add some tests for ProxyPass parameters
63ed0d3 Support keywords along with proxy_pass, use hash for params
f27d4f8 Support parameters along with proxy_pass
6cbc3d0 fix ssl_protocol docs to be in line with code
bd4ad7b Added ssl_protocol parameter to apache::mod::ssl
e440b80 allow disabling default vhosts under 2.4
760a344 (MODULES-1457) apache::vhost: SSLCACertificatePath can't be unset
7b9ad0d passenger concat needs to be wrapped in a check
b4e5213 cleanup condition
304d66c Add params to proxy_pass to provide ProxyPass key=value connection settings
d25883a Clean-up hash lookup and avoid local undef var
a88bbc7 Merge pull request #878 from igalic/init-docroot
64cb858 Merge pull request #1 from mhaskel/docroot_test_fixup
a65f3f7 Fix unit test failures with ruby 1.8.7
38d7970 add spec test for (default) docroot directory
e4aadd5 add documentation for `docroot` (in init)
3111c0d Add support for specifying the docroot option for RHEL SCL httpd24
23a2dde Merge pull request #829 from tjikkun/log_formats_sort
e72fd70 add sort to LogFormats to ensure consistency between runs
fba4862 Merge pull request #914 from tfhartmann/tfhartmann_proxy_pass
5bba3c9 Merge pull request #841 from PierreR/patch-1
d81d173 Merge pull request #908 from igalic/mod_ver
1101dae Merge pull request #909 from igalic/no_default_vh_24
c737616 Merge pull request #922 from saz/master
04814fb Merge pull request #924 from mhaskel/ubuntu_1004_pe33_fix
4002f9b Update the test to match the fix from yesterday
61789fa Fixes indentation of versioncmp
3511bd2 Merge pull request #921 from mhaskel/pe33_ubuntu1004_fix
e20f707 Relying on missing fact
9cbaac7 Merge pull request #920 from mhaskel/metadata_fixes
be2bfab MODULES-1446: mod_version is now builtin
b854601 Update metadata
c0c66be Merge pull request #919 from mhaskel/ubuntu_1004_fix
c44e513 wsgi_chunked_request doesn't work on lucid
eb5775e Merge pull request #918 from mhaskel/no_satisfy_2.4
040546d Satisfy doesn't work with apache 2.4
0edb041 Linting and adding some tests
4c54a52 Add some tests for ProxyPass parameters
934f2d4 Support keywords along with proxy_pass, use hash for params
360239c Support parameters along with proxy_pass
f774198 Merge pull request #917 from igalic/poodle
2799c4e fix ssl_protocol docs to be in line with code
8f2df79 Added ssl_protocol parameter to apache::mod::ssl
a31f00e Merge pull request #913 from vinzent/modules-1457-apache-sslcacertificatepath
2a68983 Merge pull request #911 from mcanevet/fix/el7/mod_authnz_ldap
6fc7455 Merge pull request #910 from mkobel/master
88c6a98 allow disabling default vhosts under 2.4
bc56a5e Merge pull request #912 from pdxfixit/master
62f26fd Merge pull request #916 from mhaskel/test
1f9aaad OEL7 packaging has some issues
9d4bb7c Update loadfile name for Ubuntu 10.04
56f884f Remove OEL5
1be599d Need fcgid to load after unixd on RHEL7
4fe8892 Fix vhost and mod_passenger tests on deb7
bb849cd Fix dav_svn for debian 6
ccb07c6 Fix custom_config check for ubuntu precise.
95426e5 Updates to mod::fcgid test don't work on RHEL5
dd69adc (MODULES-1457) apache::vhost: SSLCACertificatePath can't be unset
e49b77c passenger concat needs to be wrapped in a check
332c66c cleanup condition
e02a4d5 Fix authnz_ldap package name on el7
6b0a8b2 Add params to proxy_pass to provide ProxyPass key=value connection settings
cdc3680 Merge pull request #904 from mhaskel/oel7_fixes
aa0dc96 Merge pull request #905 from mhaskel/1.2.x_update
09ed715 Merge remote-tracking branch 'upstream/1.2.x' into test
e3ac319 OEL7 packaging has some issues
3d8f21a Merge pull request #903 from mhaskel/ubuntu_1004_dav_svn
be3e526 Update loadfile name for Ubuntu 10.04
0b0a226 Merge pull request #901 from antaflos/consolidate_alias_scriptalias
0dd65e8 Merge pull request #902 from mhaskel/metadata
23f22ec Remove OEL5
83476d4 Merge pull request #898 from domcleal/add-default-charset
7897f37 Allow specifying all alias directives in `aliases`
a92b8fb Add parameter for AddDefaultCharset virtual host directive
bb7ee1a Merge pull request #894 from domcleal/vhost-passenger
6300be8 Merge pull request #890 from retr0h/feature/MODULES-1423
e269a47 Merge pull request #888 from UniversityofWarwick/master
ce12877 Merge pull request #893 from DavidS/patch-1
e69a892 Merge pull request #895 from tskirvin/master
f8953f7 Turning off SSLv3 by default, re: CVE-2014-3566 (POODLE SSL vuln.)
5278807 Add Passenger related parameters to vhost
7fa34ca Fix misleading error message
8e94543 Merge pull request #891 from jbondpdx/fix-readme
2b7cf7f DOCUMENT-112: Clarified path key values
5cdb25c DOCUMENT-112: Clarifying DirectoryMatch info
e5d5f64 (#1423) Added the WSGIChunkedRequest directive to vhost
da02e70 shib_request_settings now a hash intead of array.
846adab Fix Shib setting rules.
d051887 Merge pull request #885 from deltab/patch-1
998d06a Fix broken link to Order directive docs
525667d Merge pull request #884 from blkperl/remove_concat_deprecation
4aa8843 Remove deprecated concat::setup class
8021b59 Merge pull request #883 from puppetlabs/revert-882-master
6ba3afe Revert "ScriptAlias needs to come before Alias."
039870a Merge pull request #882 from daveseff/master
d3b6711 Merge pull request #881 from Matoch/MODULES-1396-RedirectMatch_rules_do_not_work_in_the_Apache_module
acee4c5 ScriptAlias needs to come before Alias.
e8810a1 Fixes two errors in the redirectmatch usage description
c78f99c Resolves MODULES 1369 RedirectMatch rules do not work in Apache module
88f1ef4 Merge pull request #850 from Aethylred/mod_shib
5a929a0 Actually insert those values into the template... and we need the line ending too.
01aff84 Merge pull request #879 from mhaskel/fcgid_fix
9715ac0 Need fcgid to load after unixd on RHEL7
033dfec Merge pull request #876 from mhaskel/deb_7_fixes
dc7e772 Fix vhost and mod_passenger tests on deb7
776437c Update documentation for mod_shib
b20fb1c Merge pull request #874 from mhaskel/dav_svn_deb6
318f5f6 Add the minimum required shibboleth declarations to directories hashes. Ignored if mod_shib not defined.
14f5b78 Fix dav_svn for debian 6
4c8b6ad AllowEncodedSlashes can have a server default set with the apache class, and overridden with an apache::vhost declaration
049fd54 Stripping out the shibboleth daemon config out into a separate module.
207d316  Update and expand spec tests, including code fixes to match expected behaviour.
92f8b48 Documentation (and a few tweaks to make code match docs)
4f68995 Define the back end certifiate as a resource because there will only be one.
8046a26 Create a resource for downloading attribute map files
4bb1576 Download metadata and metadata certificate from provider.
bfc2c7c Stubbing out metadata for shib
f5523e7 define a shibboleth sso resource
e8f7566 Created the apache::mod::shib class to install the mod_shib Shibboleth module for Apache2
0bdb757 changed from depreciated apache::dev to apache::mod::dev
350cc27 Merge pull request #871 from mhaskel/1.2.0-prep
5bb6b94 Merge pull request #873 from mhaskel/custom_config_fix
19ce43f Merge pull request #872 from mhaskel/fix_fcgid_test
0f2a0b3 Fix custom_config check for ubuntu precise.
bb6ef28 Updates to mod::fcgid test don't work on RHEL5
de15de3 1.2.0 prep
91007b1 Merge pull request #865 from p7s1-wschreiner/patch-1
81b9541 Merge pull request #866 from domcleal/ssl-crl-check
7953700 Merge pull request #870 from cyberious/DirectoriesAuthRequire
acc7980 Add support to set SSLCARevocationCheck on Apache 2.4
bf724e4 Update to include auth_required for versions other than 2.4 but keeping at the top of the section
808e387 Merge pull request #867 from mhaskel/MODULES-1348
d81a202 Merge pull request #868 from puppetlabs/revert-789-init-var-cleanup
247b802 Merge pull request #869 from puppetlabs/revert-844-patch-1
7a87768 Revert "Fix duplicate declarations when puppet manages logroot for vhosts"
df1b4d5 Merge pull request #844 from vpassapera/patch-1
3782afd Merge pull request #852 from richm/bug/modules-1332
cf9d120 Revert "Remove deprecated purge_vdir; Rename variables"
1c40da0 MODULES-1348 - apache::vhost concat ordering
452a012 Merge pull request #857 from kritznl/master
ae374cc Update default_mods.pp
c54405e Merge pull request #858 from justinstoller/bug/master/1907-fixup-mod_negotiation
5cb7f96 Merge pull request #859 from justinstoller/bug/master/1908-fixup-mod_php
7755593 Merge pull request #860 from justinstoller/bug/master/FM-1911-passenger-needs-pty
25592d6 Merge pull request #861 from justinstoller/bug/master/FM-1913-passenger-fails-on-el-7
2f48954 (FM-1913) fix passenger tests on EL derivatives
a53b9ed (FM-1911) Fixup passenger system test
57f83d9 (FM-1908) fixup mod_php tests
9bd66e0 (FM-1907) Fix mod_negotation system tests
d84e426 Fix missing newline after ModPagespeed filter and memcached servers directives
a529a40 Update vhost.pp
c24e2fa Clean-up hash lookup and avoid local undef var

Puppetfile

@@ -1,5 +1,5 @@
 mod 'apache',
-  :commit => '8d09ecd81ce1001d9461570716d20898fe336f4a',
+  :commit => '1417312b493ea79f88f22cc8b961d8db08cb9273',
   :git => 'https://github.com/puppetlabs/puppetlabs-apache.git'
 
 mod 'aviator',

apache/.geppetto-rc.json

@@ -0,0 +1,9 @@
+{
+  "excludes": [
+    "**/contrib/**",
+    "**/examples/**",
+    "**/tests/**",
+    "**/spec/**",
+    "**/pkg/**"
+  ]
+}

apache/.travis.yml

@@ -1,6 +1,6 @@
 ---
 language: ruby
-bundler_args: --without development
+bundler_args: --without system_tests
 script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
 matrix:
   fast_finish: true

apache/CHANGELOG.md

@@ -1,3 +1,106 @@
+##2014-09-30 - Supported Release 1.2.0
+###Summary
+
+This release features many improvements and bugfixes, including several new defines, a reworking of apache::vhost for more extensibility, and many new parameters for more customization. This release also includes improved support for strict variables and the future parser.
+
+####Features
+- Convert apache::vhost to use concat for easier extensions
+- Test improvements
+- Synchronize files with modulesync
+- Strict variable and future parser support
+- Added apache::custom_config defined type to allow validation of configs before they are created
+- Added bool2httpd function to convert true/false to apache 'On' and 'Off'. Intended for internal use in the module.
+- Improved SCL support
+  - allow overriding of the mod_ssl package name
+- Add support for reverse_urls/ProxyPassReverse in apache::vhost
+- Add satisfy directive in apache::vhost::directories
+- Add apache::fastcgi::server defined type
+- New parameters - apache
+  - allow_encoded_slashes
+  - apache_name
+  - conf_dir
+  - default_ssl_crl_check
+  - docroot
+  - logroot_mode
+  - purge_vhost_dir
+- New parameters - apache::vhost
+  - add_default_charset
+  - allow_encoded_slashes
+  - logroot_ensure
+  - logroot_mode
+  - manage_docroot
+  - passenger_app_root
+  - passenger_min_instances
+  - passenger_pre_start
+  - passenger_ruby
+  - passenger_start_timeout
+  - proxy_preserve_host
+  - redirectmatch_dest
+  - ssl_crl_check
+  - wsgi_chunked_request
+  - wsgi_pass_authorization
+- Add support for ScriptAlias and ScriptAliasMatch in the apache::vhost::aliases parameter
+- Add support for rewrites in the apache::vhost::directories parameter
+- If the service_ensure parameter in apache::service is set to anything other than true, false, running, or stopped, ensure will not be passed to the service resource, allowing for the service to not be managed by puppet
+- Turn of SSLv3 by default
+- Improvements to apache::mod*
+  - Add restrict_access parameter to apache::mod::info
+  - Add force_language_priority and language_priority parameters to apache::mod::negotiation
+  - Add threadlimit parameter to apache::mod::worker
+  - Add content, template, and source parameters to apache::mod::php
+  - Add mod_authz_svn support via the authz_svn_enabled parameter in apache::mod::dav_svn
+  - Add loadfile_name parameter to apache::mod
+  - Add apache::mod::deflate class
+  - Add options parameter to apache::mod::fcgid
+  - Add timeouts parameter to apache::mod::reqtimeout
+  - Add apache::mod::shib
+  - Add apache_version parameter to apache::mod::ldap
+  - Add magic_file parameter to apache::mod::mime_magic
+  - Add apache_version parameter to apache::mod::pagespeed
+  - Add passenger_default_ruby parameter to apache::mod::passenger
+  - Add content, template, and source parameters to apache::mod::php
+  - Add apache_version parameter to apache::mod::proxy
+  - Add loadfiles parameter to apache::mod::proxy_html
+  - Add ssl_protocol and package_name parameters to apache::mod::ssl
+  - Add apache_version parameter to apache::mod::status
+  - Add apache_version parameter to apache::mod::userdir
+  - Add apache::mod::version class
+
+####Bugfixes
+- Set osfamily defaults for wsgi_socket_prefix
+- Support multiple balancermembers with the same url
+- Validate apache::vhost::custom_fragment
+- Add support for itk with mod_php
+- Allow apache::vhost::ssl_certs_dir to not be set
+- Improved passenger support for Debian
+- Improved 2.4 support without mod_access_compat
+- Support for more than one 'Allow from'-directive in _directories.erb
+- Don't load systemd on Amazon linux based on CentOS6 with apache 2.4
+- Fix missing newline in ModPagespeed filter and memcached servers directive
+- Use interpolated strings instead of numbers where required by future parser
+- Make auth_require take precedence over default with apache 2.4
+- Lint fixes
+- Set default for php_admin_flags and php_admin_values to be empty hash instead of empty array
+- Correct typo in mod::pagespeed
+- spec_helper fixes
+- Install mod packages before dealing with the configuration
+- Use absolute scope to check class definition in apache::mod::php
+- Fix dependency loop in apache::vhost
+- Properly scope variables in the inline template in apache::balancer
+- Documentation clarification, typos, and formatting
+- Set apache::mod::ssl::ssl_mutex to default for debian on apache >= 2.4
+- Strict variables fixes
+- Add authn_core mode to Ubuntu trusty defaults
+- Keep default loadfile for authz_svn on Debian
+- Remove '.conf' from the site-include regexp for better Ubuntu/Debian support
+- Load unixd before fcgid for EL7
+- Fix RedirectMatch rules
+- Fix misleading error message in apache::version
+
+####Known Bugs
+* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
+* SLES is unsupported.
+
 ##2014-07-15 - Supported Release 1.1.1
 ###Summary
 

apache/CONTRIBUTING.md

@@ -41,11 +41,9 @@ Checklist (and a short version for the impatient)
 
     * Pre-requisites:
 
-      - Sign the [Contributor License Agreement](https://cla.puppetlabs.com/)
-
       - Make sure you have a [GitHub account](https://github.com/join)
 
-      - [Create a ticket](http://projects.puppetlabs.com/projects/modules/issues/new), or [watch the ticket](http://projects.puppetlabs.com/projects/modules/issues) you are patching for.
+      - [Create a ticket](https://tickets.puppetlabs.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppetlabs.com/browse/) you are patching for.
 
     * Preferred method:
 
@@ -94,17 +92,7 @@ The long version
       whitespace or other "whitespace errors".  You can do this by
       running "git diff --check" on your changes before you commit.
 
-  2.  Sign the Contributor License Agreement
-
-      Before we can accept your changes, we do need a signed Puppet
-      Labs Contributor License Agreement (CLA).
-
-      You can access the CLA via the [Contributor License Agreement link](https://cla.puppetlabs.com/)
-
-      If you have any questions about the CLA, please feel free to
-      contact Puppet Labs via email at [email protected].
-
-  3.  Sending your patches
+  2.  Sending your patches
 
       To submit your changes via a GitHub pull request, we _highly_
       recommend that you have them on a topic branch, instead of
@@ -124,7 +112,7 @@ The long version
       in order to open a pull request.
 
 
-  4.  Update the related GitHub issue.
+  3.  Update the related GitHub issue.
 
       If there is a GitHub issue associated with the change you
       submitted, then you should update the ticket to include the
@@ -220,14 +208,12 @@ review.
 Additional Resources
 ====================
 
-* [Getting additional help](http://projects.puppetlabs.com/projects/puppet/wiki/Getting_Help)
+* [Getting additional help](http://puppetlabs.com/community/get-help)
 
 * [Writing tests](http://projects.puppetlabs.com/projects/puppet/wiki/Development_Writing_Tests)
 
 * [Patchwork](https://patchwork.puppetlabs.com)
 
-* [Contributor License Agreement](https://projects.puppetlabs.com/contributor_licenses/sign)
-
 * [General GitHub documentation](http://help.github.com/)
 
 * [GitHub pull request documentation](http://help.github.com/send-pull-requests/)

apache/Gemfile

@@ -1,15 +1,18 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
-group :development, :test do
+group :development, :unit_tests do
   gem 'rake',                    :require => false
   gem 'rspec-puppet',            :require => false
   gem 'puppetlabs_spec_helper',  :require => false
-  gem 'serverspec',              :require => false
   gem 'puppet-lint',             :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
-  gem 'pry',                     :require => false
   gem 'simplecov',               :require => false
+  gem 'puppet_facts',            :require => false
+  gem 'json',                    :require => false
+end
+
+group :system_tests do
+  gem 'beaker-rspec',  :require => false
+  gem 'serverspec',    :require => false
 end
 
 if facterversion = ENV['FACTER_GEM_VERSION']