Skip to content

Commit 22eca98

Browse files
Dinesh Gujarsmortex
authored and
Dinesh Gujar
committed
CAT-1347 erb to epp conversion
Simplify data types and array handling The type Stdlib::Host includes Stdlib::IP::Address, so the variant is redundant. There's also no way to pass nested arrays so flatten is not needed. Fix remoteip data types Fixes: df6862a ("Simplify data types and array handling") strickter loglevel syntax verification Update loglevel_spec.rb Update types/loglevel.pp Co-authored-by: Romain Tartière <romain@blogreen.org> Raise Puppet lower bound to >= 7.9.0 Similar to eb5b4c0 this module uses PUP-5704[1] which was only introduced in Puppet 7.9.0. [1]: https://www.puppet.com/docs/puppet/7/release_notes_puppet.html#enhancements_puppet_x-7-9-0-PUP-5704 Fixes: 8070478 ("(CONT-772) Update metadata.json and Gemfile") (CAT-1308) Improving documentation for default mods override Add the missing mod_authnz_ldap parameters This is the full list from https://httpd.apache.org/docs/2.4/mod/mod_authnz_ldap.html Following the current style of CamelCase -> snake_case Simplify the syntax for boolean arguments As suggested by @ekohl during review. (CAT-1417) Nested require support for authz_core mod Update manifests/vhost.pp Co-authored-by: Romain Tartière <romain@blogreen.org>
1 parent 99b4488 commit 22eca98

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+1736
-967
lines changed

.rubocop_todo.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,3 +156,8 @@ RSpec/RepeatedExampleGroupDescription:
156156
RSpec/StubbedMock:
157157
Exclude:
158158
- 'spec/util/apache_mod_platform_compatibility_spec.rb'
159+
160+
# Offense count: 1
161+
Metrics/BlockLength:
162+
Exclude:
163+
- 'lib/puppet/functions/apache/authz_core_config.rb'

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
664664

665665
### Fixed
666666

667-
- Actually create CASScrubRequestHeaders setting in _auth_cas.erb [#1730](https://github.com/puppetlabs/puppetlabs-apache/pull/1730) ([](https://github.com/))
667+
- Actually create CASScrubRequestHeaders setting in _auth_cas.epp [#1730](https://github.com/puppetlabs/puppetlabs-apache/pull/1730) ([](https://github.com/))
668668
- Fix typos [#1728](https://github.com/puppetlabs/puppetlabs-apache/pull/1728) ([hfm](https://github.com/hfm))
669669
- [MODULES-5644] Package name is libapache2-mpm-itk for Debian 9 [#1724](https://github.com/puppetlabs/puppetlabs-apache/pull/1724) ([zivis](https://github.com/zivis))
670670
- Fix case of setting apache::mpm_module to false [#1720](https://github.com/puppetlabs/puppetlabs-apache/pull/1720) ([edestecd](https://github.com/edestecd))

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
[`apache::mod::auth_mellon`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodauth_mellon
4040
[`apache::mod::authn_dbd`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodauthn_dbd
4141
[`apache::mod::authnz_ldap`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodauthnz_ldap
42+
[`apache::mod::authz_core`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodauthz_core
4243
[`apache::mod::cluster`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodcluster
4344
[`apache::mod::data]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemoddata
4445
[`apache::mod::disk_cache`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemoddisk_cache
@@ -157,6 +158,7 @@
157158
[`mod_authnz_external`]: https://github.com/phokz/mod-auth-external
158159
[`mod_auth_dbd`]: http://httpd.apache.org/docs/current/mod/mod_authn_dbd.html
159160
[`mod_auth_mellon`]: https://github.com/UNINETT/mod_auth_mellon
161+
[`mod_authz_core`]: https://httpd.apache.org/docs/current/mod/mod_authz_core.html
160162
[`mod_dbd`]: http://httpd.apache.org/docs/current/mod/mod_dbd.html
161163
[`mod_disk_cache`]: https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html
162164
[`mod_dumpio`]: https://httpd.apache.org/docs/2.4/mod/mod_dumpio.html

0 commit comments

Comments
 (0)