Merge pull request #2151 from puppetlabs/release-prep

Release prep v6.1.0

Author: pmcmaw

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v6.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.1.0) (2021-05-17)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.0.1...v6.1.0)
+
+### Added
+
+- support for uri for severname with use\_servername\_for\_filenames [\#2150](https://github.com/puppetlabs/puppetlabs-apache/pull/2150) ([Zarne](https://github.com/Zarne))
+- \(MODULES-11061\) mod\_security custom rule functionality [\#2145](https://github.com/puppetlabs/puppetlabs-apache/pull/2145) ([k2patel](https://github.com/k2patel))
+
 ## [v6.0.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.0.1) (2021-05-10)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v6.0.0...v6.0.1)

REFERENCE.md

@@ -5969,8 +5969,6 @@ The following parameters are available in the `apache::mod::security` class:
 * [`activated_rules`](#activated_rules)
 * [`modsec_dir`](#modsec_dir)
 * [`modsec_secruleengine`](#modsec_secruleengine)
-* [`custom_rules`](#custom_rules)
-* [`custom_rules_set`](#custom_rules_set)
 * [`audit_log_relevant_status`](#audit_log_relevant_status)
 * [`audit_log_parts`](#audit_log_parts)
 * [`audit_log_type`](#audit_log_type)
@@ -5994,6 +5992,8 @@ The following parameters are available in the `apache::mod::security` class:
 * [`secrequestbodynofileslimit`](#secrequestbodynofileslimit)
 * [`secrequestbodyinmemorylimit`](#secrequestbodyinmemorylimit)
 * [`manage_security_crs`](#manage_security_crs)
+* [`custom_rules`](#custom_rules)
+* [`custom_rules_set`](#custom_rules_set)
 
 ##### <a name="version"></a>`version`
 
@@ -6043,23 +6043,6 @@ Configures the rules engine.
 
 Default value: `$apache::params::modsec_secruleengine`
 
-##### <a name="custom_rules"></a>`custom_rules`
-
-Data type: `Boolean`
-
-Enable Custom rules for security, this does not create or provide any rules rather it facilitate to add custom rules.
-If enabled, must provide `custom_rules_set`.
-
-Default value: `$apache::params::modsec_custom_rules`
-
-##### <a name="custom_rules_set"></a>`custom_rules_set`
-
-Data type: `[Array]`
-
-Customrules must be array of rules, for an example `['REMOTE_ADDR "^127.0.0.1" "id:199999,phase:1,nolog,allow,ctl:ruleEngine=off"']`.
-Configures the set of custom rules.
-
-Default value: `$apache::params::modsec_custom_rules_set`
 ##### <a name="audit_log_relevant_status"></a>`audit_log_relevant_status`
 
 Data type: `Any`
@@ -6246,6 +6229,22 @@ Toggles whether to manage ModSecurity Core Rule Set
 
 Default value: ``true``
 
+##### <a name="custom_rules"></a>`custom_rules`
+
+Data type: `Any`
+
+
+
+Default value: `$apache::params::modsec_custom_rules`
+
+##### <a name="custom_rules_set"></a>`custom_rules_set`
+
+Data type: `Any`
+
+
+
+Default value: `$apache::params::modsec_custom_rules_set`
+
 ### <a name="apachemodsetenvif"></a>`apache::mod::setenvif`
 
 Installs `mod_setenvif`.

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "6.0.1",
+  "version": "6.1.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",