Skip to content

Commit

Permalink
Update apache to 535ac43
Browse files Browse the repository at this point in the history
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
8d09ecd (#MODULES-1332) set osfamily default for wsgi_socket_prefix
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
5ef11d7 Merge pull request #855 from cyberious/master
e5eb48d Merge pull request #856 from misterdorm/puppet37x
95abc86 Merge pull request #849 from kritznl/master
a39c259 Merge pull request #840 from digitalmediacenter/fix_puppet_lint_errors
9724bf2 Merge pull request #833 from GeoffWilliams/classroom_php_fix
1dc3451 Changing $port to interpolated string "${port}" to fix "Cannot use Fixnum where String is expected" errors under Puppet 3.7.x
9692e84 Merge branch '1.1.x' into master
0d39322 MODULES-1294 Fix issue with auth_require not taking precedence over default of require all granted, added checks for require and auth_require before adding the default
2b3a9f0 Fix some Puppet Lint errors
b8d4a2f Merge pull request #851 from olivierHa/master
aa4d07a Fix correct type for php_admin and sort hash
eb191cb Merge pull request #837 from bodepd/ensure_conf_after_package
9a9877f Fix typo in mod::pagespeed memache_servers
52cdf49 Merge pull request #842 from antaflos/patch-2
7a98903 Fix issue with puppet_module_install, removed and using updated method from beaker core copy_module_to
a529a40 Update vhost.pp
7beef45 Merge pull request #843 from justinstoller/maint/master/fix-lint-errors
ba8f815 (FM-1876) Remove trailing whitespace from manifests/vhost.pp
b1c2ce0 Fix formatting of sethandler description
c24e2fa Clean-up hash lookup and avoid local undef var
24bf570 Merge pull request #836 from mhaskel/MODULES-1180
f4ecfa2 Add defined type for handling custom configs
873d829 Ensure that mod packages are installed before conf
e550ec2 force class definition checks to use absolute scope
c220ddd Merge pull request #782 from igalic/bool2httpd-function
d2ad8ec function to munge booleans to httpd's On/Off
2425abf Merge pull request #830 from roidelapluie/Allow-multiple-balancermember-with-the-same-url
4a8b692 Allow multiple balancermembers with the same url
06974f7 Merge pull request #832 from thatgraemeguy/master
7789e18 Merge pull request #807 from Ginja/expose_logroot_mode
4ece061 Added missing syntax highlight to 1st apache::mod::php example
1b4e942 Allow for better $logroot management
7bd92bc Merge pull request #821 from smerrill/feature/fix-remaining-rhel6-scl-issues
3183890 Merge pull request #831 from mhaskel/typo
3f4630c Apparently missed one of these in the conversion
6af0c50 Merge pull request #828 from setola/typefix
118e747 make puppetlint happy with ${variable} syntax
9a39347 fixed type bug
8346bd2 Merge pull request #827 from mhaskel/strict_variable_fix
08c29d0 Merge pull request #775 from ekohl/validate_wsgi_pass_authorization
4740e84 Add missing kernel fact
3d6e015 Merge pull request #826 from mhaskel/relative-lint
cd5bc5b Add --relative flag
3d89d9d Merge pull request #825 from mhaskel/vhost
f1d64a0 Convert apache::vhost to use concat fragments.
bd890c2 Add apache::conf_dir, use it instead of params.
80be736 Add regex validation to wsgi_pass_authorization
b41cbf3 Merge pull request #818 from smerrill/feature/allow-mod-ssl-customization
db8a4f8 Merge pull request #819 from smerrill/feature/allow-different-apache-package
e15c1b7 Allow overriding the detected $apache_name.
503be6d Allow other manifests to define ::apache::mod{ 'ssl': }.
445fdc7 Merge pull request #820 from mhaskel/vhost_fixes
15a6687 Fix dependency loop in vhost
e48b509 Merge pull request #815 from justinstoller/maint/master/dont-install-multiple-times
476c31a Merge pull request #816 from roidelapluie/Remove_Inline_Template_Depreciation_Warning
4736f50 Call @proxy_set insteat of proxy_set in inline_template
05370c2 Don't support acceptance testing against apache on windows or osx
d085275 Call install_* methods only once in spec_helper_acceptance
33b456b Merge pull request #814 from mhaskel/MODULES-913
c180f2e MODULES-913 Documentation update
2b72aed Merge pull request #806 from igalic/manage-docroot
935ee10 fix for #802: when !manage_docroot, don't require it
a11908f Merge pull request #813 from mhaskel/MODULES-743
094e9b3 Merge pull request #812 from mhaskel/MODULES-75
fbc2916 Removed extra whitespace
fa8bf12 Add a validate_string check for custom_fragment.
1fce927 Merge pull request #810 from puphpet/mutex-debian
70ccfdf Merge pull request #811 from mhaskel/693-rebase
1f8a39b Merge pull request #792 from roidelapluie/reqtimeout
b2b0022 Merge pull request #793 from roidelapluie/Allow_to_set_multiple_ProxyPassReverse_directives
231832e Allow to set ProxyPassReverse attributes on a vhost
990ffef Add a timeouts parameter to apache::mod::reqtimeout
70934a4 Merge branch 'ticket/modules-111-add_directory_rewrites' of https://github.com/blhughes/puppetlabs-apache into blhughes-ticket/modules-111-add_directory_rewrites
328cbf8 Merge pull request #808 from md-systems/master
fcb4a09 Support itk with mod php
2093c1e Set $ssl_mutex to default for Debian $apache_version > 2.4
62dac65 Merge pull request #809 from mhaskel/fix_travis
d6d120a Update spec tests and README for fcgi_server
2d2fae7 Merge branch 'change-alias-variable-name' of github.com:puphpet/puppetlabs-apache into puphpet-change-alias-variable-name
068e56e Merge pull request #803 from Mylezeem/ensure_default_vhost_false_scope
7b33ee2 Merge pull request #804 from hunner/strict_variables
7fd9a90 Merge pull request #805 from mhaskel/1.1.x-merge
d11a795 Merge branch '1.1.x' into test
63a1a82 Fix strict variables
1db1e47 vhost: Create the $logroot only when necessary.
90163b1 Merge pull request #785 from JCotton1123/dynamic-deflate-types
4469e5d Merge pull request #802 from igalic/manage-docroot
dfaae9a introduce flag to manage the docroot
86e1118 Merge pull request #717 from genebean/add-options-to-mod_info
623b672 Merge pull request #800 from jestallin/bug-1142
232965c Add authn_core mod to ubuntu trusty defaults
b0ea1ed Merge pull request #799 from minorOffense/master
cd8abec Removed stray quotation
212e09d Merge pull request #798 from apenney/111-release
eab15fb Prepare a 1.1.1 release.
28d2371 Added the ability to customize mod_info's settings. Updated README.md with new settings info. Updated tests for apache::mod::info
d00631c Merge pull request #791 from mhaskel/rhel7-test-fixes
b62bb06 Mark tests depending on passenger as pending on RHEL7.
d5c9d83 Merge pull request #789 from JCotton1123/init-var-cleanup
306682a Remove deprecated purge_vdir; Rename variables
cb1b8b8 Merge pull request #786 from JCotton1123/vhost-dir-purge
e496d85 Add deflate params types and notes
ff8f081 Merge pull request #788 from cmurphy/master
292d2c2 Fix failing lint tests
e94f504 Disable 'Only variable string' lint check in .sync.yml
2c27ba5 Merge pull request #780 from puphpet/faux_path-fix
e2b54c1 Merge pull request #783 from hunner/strict_variables
04b74e4 Merge pull request #787 from tdb/allow-unset-ssl_certs_dir
adc096d Add validate and lint tasks to travis script
bec6a5f Allow ssl_certs_dir to be unset.
2dbb1ec Add param to ctrl purging of vhost dir
240aca0 Update tests for strict variable testing
c750c15 Merge pull request #779 from cmurphy/master
1449585 Merge pull request #750 from Arakmar/dav_svn
576f4b7 Update Gemfile for .travis.yml defaults
807db14 Changes $alias to $fcgi_alias to preent Puppet complaining about using that name
a56edb2 Adds @ to faux_path template variable
18fc65b Merge pull request #778 from hunner/fix_fastcgi_server
e8ebe47 Fix tests for fastcgi
59f152f Synchronize .travis.yml
a7858b1 Update .sync.yml to support new .travis.yml configs
4849904 Keep the default loadfile for authz_svn on Debian. Fix acceptance tests due to the new naming.
c9a5404 Merge pull request #704 from JCotton1123/fastcgi-resource
7907c65 Merge pull request #743 from amateo/feature/negotiation
514ca05 Merge pull request #752 from Arakmar/satisfy
3049676 Merge pull request #760 from oxilion/logrootperms
23818ac Merge pull request #763 from apenney/rspec3
e4e7b5b Merge pull request #767 from apenney/pin-rspec
0a2575b Merge pull request #774 from cmurphy/master
8bd6b6c Sync files
4f65ef3 Add configuration file for modulesync
2d58357 Add the Satisfy parameter to the directory fragment.
4e59789 Merge pull request #755 from jlambert121/modules-1065
9f19e32 * force_language_priority can be now an array and language_priority a string * coerce parameters to an array
c033576 Merge pull request #770 from mhaskel/osx_graceful_failure
a306c0c Add test case for graceful failure on OSX.
198aa99 Add parameters to configure negotiation module
8c73ec3 Merge pull request #768 from mhaskel/test_cleanup
0925fc2 Delete gentoo a2mod tests.
3ad5b24 Pin rspec to ~> 2.11
aa012cf Pin rspec to 2.x.
ae714e0 MODULES-1065: Add ThreadLimit to mod::worker
359b3a1 Merge pull request #744 from amateo/feature/php
2d3724d Convert specs to RSpec 3.0.0 syntax with Transpec
0132518 Convert specs to RSpec 3.0.0 syntax with Transpec
9f97fc7 Convert specs to RSpec 3.0.0 syntax with Transpec
815f5cd Convert specs to RSpec 3.0.0 syntax with Transpec
a6c1fbc Merge pull request #721 from mcanevet/fix/strict_variables
240197f Fix module usage with strict_variables
12e90ab Add parameters to provide content, template or source to the php module
024d983 Merge pull request #735 from Malefitz/master
07afa8c Merge pull request #762 from antaflos/patch-1
c605967 Remove an unnecessary empty line in directories
af9fa52 Merge pull request #741 from n00by/patch-1
2771531 make logroot_mode configurable
c91d1b0 Merge pull request #742 from antaflos/debian_ubuntu_passenger_rework
e4a0615 Merge pull request #761 from bodgit/deflate
71a1d9a Merge pull request #759 from caezs/master
cae2516 Rework Passenger support for Debian and update docs
39d5aca Merge pull request #739 from xavierleune/mod_rewrite_duplicate_error
c2203ca Merge pull request #758 from mhaskel/loadfile_name_fixes
c07e6f7 Add DeflateFilterNote directives
22cb343 make logroot_mode configurable
78ee7ff Change the site-include regexp to work better with Debian/Ubuntu as it is commonly used practice to omit the '.conf' part on vhost files.
b02d29e Merge pull request #716 from ekohl/fcgid
9c3da14 Missed some file resource namechanges.
222f61e Merge pull request #756 from pcfens/more-2.4
4607756 Add better native support for Apache 2.4 when mod_access_compat isn't installed/enabled
c12048b Merge pull request #757 from mhaskel/authz_svn_test_fix
722cdc0 Filename not updated in the test.
1fb5b34 Merge pull request #749 from hunner/fix_passenger_repo
22e660d Fix passenger repo on Scientific linux
da592f4 Merge pull request #738 from kgeis/patch-1
ae4279b Merge pull request #747 from mhaskel/unsupported_test_fix
a4f8c39 Only run mod_mime test on supported platforms.
9f35d28 Merge pull request #696 from baurmatt/master
d4dbd9b Add support for SVN authentication (mod_authz_svn)
f4eb4fa Merge pull request #746 from mhaskel/rename_mod_load
7bc201a Renamed file resource to use loadfile_name if provided.
e66c783 Merge pull request #737 from mhaskel/rename_mod_load
ad0500e Update _proxy.erb
e2666dc Merge pull request #740 from mhaskel/mod-pagespeed-fix
a363221 Let's not hardcode x86_64...
8a44be7 Change inclusion of apache::mod::rewrite in vhost.pp
88408f1 Add ability for handling more than one 'Allow from'-directive in _directories.erb
bfa206e Update README.md
9cc8f3d MODULES-956 Added loadfile_name parameter to apache::mod.
179fb89 Add fcgid options
6a42920 Merge pull request #736 from mhaskel/test_failures
6a60fe4 Resolve test failures on apache.
cc7e927 Merge pull request #734 from mhaskel/prep-1.1.0
731329c Update PE version requirements.
0b66f60 Merge pull request #733 from mhaskel/fix-test-failures
644cb96 default shouldn't be quoted in the selector.
81069bc Merge pull request #731 from blkperl/convert_versions_to_string
0aa6b0f (MODULES-910) Convert @apache_version to a string
ef9e6c8 Merge pull request #690 from arnoudj/master
b2decac Merge pull request #694 from Conzar/master
2c58046 Prepare a 1.1.0 release.
74dff45 Merge pull request #730 from mhaskel/metadata
e083e8f Update supported versions in metadata.json
862c481 Merge pull request #726 from mhaskel/rhel5-fixes
fbf9678 Merge pull request #727 from mhaskel/ubuntu1004-fixes
fc96087 Merge pull request #728 from mhaskel/readme-update
204038e Add notes in README about untested functionality for RHEL5 and RHEL7.
8e7ef15 Fix lib path for Ubuntu 10.04.
fc9e519 Fix failing tests on RHEL5.
c6aa70a Merge pull request #724 from mhaskel/selinux
2cc4b5f Merge pull request #725 from mhaskel/travis
e7a512e Fix issues in the travis-ci build.
8f03f6c SELinux updates.
2ea49e1 Add fastcgi external server defined type
82a6ba0 Merge pull request #723 from mhaskel/rhel7-fixes
f19ec76 Some initial cleanup for RHEL7.
c9bc436 Merge pull request #720 from mhaskel/vhost_mode_fix
7895319 'be_mode' was getting confused by the leading 0.
9fd1cb2 Merge pull request #719 from mhaskel/ubuntu-testing
1d72c41 Add a nodeset for Ubuntu 14.04.
c8bd21a Merge pull request #711 from GregSutcliffe/master
6b14fd0  Configure Passenger in separate .conf file on Debian so PassengerRoot isn't lost
4eff354 Merge pull request #712 from ekohl/suexec
492ef10 Merge pull request #714 from mhaskel/pagespeed
9d2067c Add suexec support
ca03c51 Merge pull request #715 from hunner/php-allow-custom-ext
8fb2dfd Update specs
15b3adc Use access_compat on 2.4, and update pagespeed to load the correct module in 2.4.
fc347a8 Typo
5a8df9f Changing extensions.join to extensions.flatten.compact.join
c647db0 Allow custom extensions for php handler
82e3de9 Merge pull request #652 from rchouinard/mod_speling
edd20d0 Merge pull request #697 from ckaenzig/vhost-docroot_mode
7369205 Merge pull request #709 from cvdwel/patch-1
ce04ebe Merge pull request #703 from attachmentgenie/MaxKeepAliveRequests
16e8c50 added documentation and test for ProxyPreserveHost option
8481e7d Updated readme with WSGIPassAuthorization information, updated spec and rspec tests for WSGIPassAuthorization.
920df08 Added The ProxyPreserveHost option to vhosts.
debc086 Added WSGIPassAuthorization option to vhost.
770c111 Merge pull request #710 from ekohl/patch-1
fe2d1be Merge pull request #698 from jonoterc/fix_passenger_redhat
fbaa448 Merge pull request #708 from mhaskel/NameVirtualHost-deprecation
2e6648d Fix platform for centos-6.5
c733ea4 Remove non-SSL rewrite example from apache::vhost
373a8a9 Don't include the NameVirtualHost directives in apache >= 2.4, and add tests for this that will at least work with Ubuntu 13.10 and Ubuntu 14.04.
4cf7709 Merge pull request #707 from mhaskel/typos
8c504df Fixing typos!
94f2d77 renaming variable to be inline with other variables
e42f768 introducing new setting to documentation
a6f92a9 turning MaxKeepAliveRequests into a variable
6218140 Merge pull request #701 from oxilion/proxyset_sortorder
a444355 order proxy_set option so it doesn't change between runs
61ade79 Merge pull request #700 from chrisbaldauf/master
00fb3fa Fixing typo with braces in the rewrite section.
5ab2a47 Add rewrites to vhost directories
73f9487 revert apache::mod::passenger default parameters for RedHat
1fa0d70 add docroot_mode parameter to vhost
9aa2ded Add basic support for mod_speling
d37004a Whoops
f4b8241 The apache class now accepts true, false, 'running' or 'stopped' for the parameter service_ensure. Any other value wil result in the parameter 'ensure' for the Apache service being set to undef.
8f0da04 Merge pull request #604 from bodgit/sethandler
b05d141 Add SetHandler tests
97ba6c5 Add support for SetHandler directive
ee1d846 Allow Apache service not to be managed by Puppet
edcf4b0 Merge pull request #688 from sdague/master
205615f Merge pull request #687 from jonoterc/mod-passenger-2
679e3dd allow global setting of SSL cipher
fa0fd41 fix inverted ssl compression
fe03465 Merge branch 'mod-passenger-2' of https://github.com/jonoterc/puppetlabs-apache into mod-passenger-2
d0883b9 Enable overriding mod-level parameters for apache::mod::passenger
cbcefb1 Merge pull request #682 from igalic/logformat
94dc546 Merge pull request #686 from ckaenzig/typo-in-service
835b342 Fix typo in service.pp doc
5a905e4 Merge pull request #684 from oxilion/php-parameters
fce8b3b Merge pull request #685 from blkperl/fix_rake_18
fd3ebd1 rename package param, add tests and documentation
0bb362a Fixed travis by updating Gemfile to pin Rake to 10.1.1
af13807 Allow extending LogFormats
f01c6bb Merge pull request #683 from sdague/master
3b6a46f fix missing comma in sample config
208005d Merge pull request #681 from CIRB/master
98f21a0 fix missing ensure on concat::fragment resources
43c175f Add extra parameters to mod::php
1421244 Merge pull request #673 from maestrodev/proxy_html
eabdb50 Add a CentOS 6.5 beaker node
eee54e9 proxy_html needs to load libxml2 library before loading module in Debian
f30d212 Merge pull request #650 from pcfens/pagespeed
513987d Merge pull request #627 from maestrodev/mime
9b8fdf6 Merge pull request #664 from ekohl/include-wsgi
5960089 Bad dependency to .load files in apache::mod
df5df92 apache::mod::mime does not compile due to wrong file dependency
463b3d8 Merge pull request #672 from maestrodev/ubuntu-bad-version
996e597 Merge pull request #671 from maestrodev/lint
ac167f3 actions module is not included by default in Debian/Ubuntu
391bd5b Apache version in Ubuntu 13.10 is 2.4
094000e lint fixes
7d84d59 Add support for mod_pagespeed
72a8924 Merge pull request #667 from hunner/meta_travis
64fb41f Remove travis autorelease
e00f278 Remove PE support for master
ccd7095 Merge remote-tracking branch 'puppetlabs/1.0.x'
5a45cf1 Merge pull request #666 from apenney/101-release
701f711 Prepare a 1.0.1 supported release.
cf13e73 Merge pull request #665 from apenney/fix-symlink
2ec128f Replace the symlink with the actual file to resolve a PMT issue.
efffa85 Include mod wsgi when wsgi_daemon_process is given
7aff865 Merge pull request #663 from apenney/last-minute-metadata-fix
67d284a Add in missing fields to work around a Puppet bug.
dc8787e Merge pull request #662 from apenney/supported-100
eba8df9 Prepare supported module release 1.0.0.
0f51066 Merge pull request #661 from apenney/metadata
b415379 Add metadata for supported modules.
d9ac3ad Merge pull request #660 from laurenrother/1.0.x
58682fa Merge pull request #591 from typhonius/mod_actions
c39c04d Cleans up first entry formatting in changelog
736382c Allows for the configuration of mod_actions, specifically the action type triggered by the request.
416d4fc Adds "Release Notes/Known Bugs" to Changelog, updates file format to markdown, standardizes the format of previous entries
b1da7b8 Merge pull request #657 from apenney/fix-fact
6f45b71 Correct the name of this fact.
12eec9c Merge pull request #654 from apenney/ubuntu-10-compatibility
655d8dc Block out WSGI tests for Ubuntu 10.
3374fa9 Merge pull request #656 from hunner/fix_aix
eef1ea1 Correct the tests for aix
b499aa2 Merge pull request #651 from jrnt30/hierarhcyFix
f73b4d4 enable overriding mod-level parameters for apache::mod::passenger
  • Loading branch information
xbezdick committed Dec 2, 2014
1 parent ba4df67 commit 19a0b05
Show file tree
Hide file tree
Showing 185 changed files with 7,450 additions and 3,057 deletions.
2 changes: 1 addition & 1 deletion Puppetfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mod 'apache',
:commit => '769ff363a8a3c51e24f63a2494217d2d029289c6',
:commit => '535ac437e3632f36d0cb4be5ff24d25f84cece80',
:git => 'https://github.com/puppetlabs/puppetlabs-apache.git'

mod 'ceilometer',
Expand Down
12 changes: 6 additions & 6 deletions apache/.gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.pkg
pkg/
Gemfile.lock
vendor
spec/fixtures
.rspec_system
.bundle
.*sw*
vendor/
spec/fixtures/
.vagrant/
.bundle/
coverage/
2 changes: 1 addition & 1 deletion apache/.puppet-lint.rc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--relative
--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
12 changes: 12 additions & 0 deletions apache/.sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
.travis.yml:
extras:
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
Rakefile:
extra_disabled_lint_checks:
- 'disable_only_variable_string'
spec/spec_helper.rb:
unmanaged: true
47 changes: 14 additions & 33 deletions apache/.travis.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,21 @@
---
branches:
only:
- master
language: ruby
bundler_args: --without development
script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
after_success:
- git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-releng
- .forge-releng/publish
rvm:
- 1.8.7
- 1.9.3
- 2.0.0
env:
matrix:
- PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
- PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
- PUPPET_GEM_VERSION="~> 3.0"
global:
- PUBLISHER_LOGIN=puppetlabs
- secure: |-
MO4pB4bqBQJjm2yFHf3Mgho+y0Qv4GmMxTMhzI02tGy1V0HMtruZbR7EBN0i
n2CiR7V9V0mNR7/ymzDMF9yVBcgqyXMsp/C6u992Dd0U63ZwFpbRWkxuAeEY
ioupWBkiczjVEo+sxn+gVOnx28pcH/X8kDWbr6wFOMIjO03K66Y=
script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
matrix:
fast_finish: true
exclude:
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 3.2.0"
include:
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
notifications:
email: false
Loading

0 comments on commit 19a0b05

Please sign in to comment.