Skip to content

Commit eee2f5e

Browse files
authored
Merge branch 'main' into whitesource/configure
2 parents ed4e26f + 7197649 commit eee2f5e

33 files changed

Lines changed: 197 additions & 144 deletions

.github/workflows/ci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@ on:
99
jobs:
1010
Spec:
1111
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
12-
with:
13-
runs_on: "ubuntu-20.04"
1412
secrets: "inherit"
1513

1614
Acceptance:
1715
needs: Spec
1816
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
1917
with:
20-
runs_on: "ubuntu-20.04"
18+
flags: "--nightly --platform-exclude centos-7 --platform-exclude oraclelinux-7 --platform-exclude scientific-7 --platform-exclude almalinux-8"
2119
secrets: "inherit"

.github/workflows/nightly.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,12 @@ on:
88
jobs:
99
Spec:
1010
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
11-
with:
12-
runs_on: "ubuntu-20.04"
1311
secrets: "inherit"
1412

1513
Acceptance:
1614
needs: Spec
1715
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
1816
with:
19-
runs_on: "ubuntu-20.04"
17+
flags: "--nightly --platform-exclude centos-7 --platform-exclude oraclelinux-7 --platform-exclude scientific-7 --platform-exclude almalinux-8"
2018
secrets: "inherit"
2119

.puppet-lint.rc

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
--fail-on-warnings
12
--relative
2-
--no-anchor_resource-check
3+
--no-80chars-check
34
--no-140chars-check
5+
--no-class_inherits_from_params_class-check
6+
--no-autoloader_layout-check
7+
--no-documentation-check
8+
--no-single_quote_string_with_variables-check
9+
--no-anchor_resource-check
10+
--ignore-paths=.vendor/**/*.pp,.bundle/**/*.pp,pkg/**/*.pp,spec/**/*.pp,tests/**/*.pp,types/**/*.pp,vendor/**/*.pp

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ require:
55
AllCops:
66
NewCops: enable
77
DisplayCopNames: true
8-
TargetRubyVersion: '2.6'
8+
TargetRubyVersion: '3.1'
99
Include:
1010
- "**/*.rb"
1111
Exclude:

.rubocop_todo.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config`
3-
# on 2023-11-28 08:35:58 UTC using RuboCop version 1.48.1.
3+
# on 2025-07-08 13:54:59 UTC using RuboCop version 1.50.2.
44
# The point is for the user to remove these configuration records
55
# one by one as the offenses are removed from the code base.
66
# Note that changes in the inspected code, or installation of new
@@ -23,7 +23,7 @@ RSpec/FilePath:
2323
- 'spec/classes/mod/lookup_identity.rb'
2424
- 'spec/classes/mod/proxy_wstunnel.rb'
2525

26-
# Offense count: 290
26+
# Offense count: 306
2727
# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
2828
# SupportedStyles: always, named_only
2929
RSpec/NamedSubject:

CHANGELOG.md

Lines changed: 45 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,59 @@ All notable changes to this project will be documented in this file.
55

66
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).
77

8-
## [v12.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.3.0) - 2024-12-16
8+
## [v13.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v13.1.0) - 2025-11-18
9+
10+
[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v13.0.0...v13.1.0)
11+
12+
### Added
13+
14+
- Add Debian 13 support [#2603](https://github.com/puppetlabs/puppetlabs-apache/pull/2603) ([weaselp](https://github.com/weaselp))
15+
16+
## [v13.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v13.0.0) - 2025-09-24
17+
18+
[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v12.3.1...v13.0.0)
19+
20+
### Changed
21+
22+
- (MODULES-11606) Remove apache::mod::info as a default module for FreeBSD [#2610](https://github.com/puppetlabs/puppetlabs-apache/pull/2610) ([shubhamshinde360](https://github.com/shubhamshinde360))
23+
- (CAT-2360) Prepare module for Puppetcore / Drop Support for Puppet 7 [#2600](https://github.com/puppetlabs/puppetlabs-apache/pull/2600) ([david22swan](https://github.com/david22swan))
24+
25+
### Fixed
26+
27+
- (MAINT) Remove enforced Ubuntu runner from ci [#2606](https://github.com/puppetlabs/puppetlabs-apache/pull/2606) ([LukasAud](https://github.com/LukasAud))
28+
29+
### Other
30+
31+
- (CAT-2296) Update github runner image to ubuntu-24.04 [#2599](https://github.com/puppetlabs/puppetlabs-apache/pull/2599) ([shubhamshinde360](https://github.com/shubhamshinde360))
32+
33+
## [v12.3.1](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.3.1) - 2025-03-31
34+
35+
[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v12.3.0...v12.3.1)
36+
37+
### Fixed
38+
39+
- Install mod_http2 on EL if required [#2593](https://github.com/puppetlabs/puppetlabs-apache/pull/2593) ([ekohl](https://github.com/ekohl))
40+
41+
## [v12.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.3.0) - 2025-03-05
942

1043
[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v12.2.0...v12.3.0)
1144

1245
### Added
1346

47+
- Allow configuring RemoteIPProxyProtocol at VHost level [#2582](https://github.com/puppetlabs/puppetlabs-apache/pull/2582) ([smortex](https://github.com/smortex))
1448
- (CAT-2100) Add Debian 12 support [#2572](https://github.com/puppetlabs/puppetlabs-apache/pull/2572) ([shubhamshinde360](https://github.com/shubhamshinde360))
49+
- Feature: Allow to set the verbosity of the debug [#2523](https://github.com/puppetlabs/puppetlabs-apache/pull/2523) ([JGodin-C2C](https://github.com/JGodin-C2C))
1550

1651
### Fixed
1752

1853
- (CAT-2158) Upgrade rexml to address CVE-2024-49761 [#2579](https://github.com/puppetlabs/puppetlabs-apache/pull/2579) ([amitkarsale](https://github.com/amitkarsale))
1954
- Update types/oidcsettings UserInfoRefreshInterval to allow Integers again [#2578](https://github.com/puppetlabs/puppetlabs-apache/pull/2578) ([gcoxmoz](https://github.com/gcoxmoz))
2055

56+
### Other
57+
58+
- Fix mod_headers load for headers in directory #2590 [#2591](https://github.com/puppetlabs/puppetlabs-apache/pull/2591) ([uoe-pjackson](https://github.com/uoe-pjackson))
59+
- Adding ModSecurity parameter for audit log format. [#2583](https://github.com/puppetlabs/puppetlabs-apache/pull/2583) ([tamerz](https://github.com/tamerz))
60+
2161
## [v12.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.2.0) - 2024-10-23
2262

2363
[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v12.1.0...v12.2.0)
@@ -118,7 +158,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
118158
- (CAT-1283) - Enable forensic module [#2442](https://github.com/puppetlabs/puppetlabs-apache/pull/2442) ([Ramesh7](https://github.com/Ramesh7))
119159
- (CAT-1281) - Support to add cipher with respective ssl protocol [#2440](https://github.com/puppetlabs/puppetlabs-apache/pull/2440) ([Ramesh7](https://github.com/Ramesh7))
120160
- feat: add Debian12 Compability [#2439](https://github.com/puppetlabs/puppetlabs-apache/pull/2439) ([Robnarok](https://github.com/Robnarok))
121-
- Add MellonSetEnv support [#2423](https://github.com/puppetlabs/puppetlabs-apache/pull/2423) ([ic248](https://github.com/ic248))
161+
- Add MellonSetEnv support [#2423](https://github.com/puppetlabs/puppetlabs-apache/pull/2423) ([](https://github.com/))
122162
- Add the missing mod_authnz_ldap parameters [#2404](https://github.com/puppetlabs/puppetlabs-apache/pull/2404) ([chutzimir](https://github.com/chutzimir))
123163

124164
### Fixed
@@ -265,7 +305,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
265305
### Fixed
266306

267307
- Declare minimum Puppet version to be 6.24.0 [#2342](https://github.com/puppetlabs/puppetlabs-apache/pull/2342) ([ekohl](https://github.com/ekohl))
268-
- Fix RedHat + PHP 8 libphp file [#2333](https://github.com/puppetlabs/puppetlabs-apache/pull/2333) ([polatsinan](https://github.com/polatsinan))
308+
- Fix RedHat + PHP 8 libphp file [#2333](https://github.com/puppetlabs/puppetlabs-apache/pull/2333) ([cinpol](https://github.com/cinpol))
269309

270310
## [v8.3.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.3.0) - 2022-10-28
271311

@@ -514,7 +554,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
514554

515555
- (MODULES-10887) Set `use_servername_for_filenames` for defaults [#2103](https://github.com/puppetlabs/puppetlabs-apache/pull/2103) ([towo](https://github.com/towo))
516556
- pdksync - (feat) Add support for Puppet 7 [#2101](https://github.com/puppetlabs/puppetlabs-apache/pull/2101) ([daianamezdrea](https://github.com/daianamezdrea))
517-
- (feat) Add support for apreq2 MOD on Debian 9, 10 [#2085](https://github.com/puppetlabs/puppetlabs-apache/pull/2085) ([TigerKriika](https://github.com/TigerKriika))
557+
- (feat) Add support for apreq2 MOD on Debian 9, 10 [#2085](https://github.com/puppetlabs/puppetlabs-apache/pull/2085) ([TigerKirika](https://github.com/TigerKirika))
518558

519559
### Fixed
520560

@@ -667,7 +707,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
667707

668708
### Fixed
669709

670-
- (MODULES-9014) Improve SSLSessionTickets handling [#1923](https://github.com/puppetlabs/puppetlabs-apache/pull/1923) ([FredericLespez](https://github.com/FredericLespez))
710+
- (MODULES-9014) Improve SSLSessionTickets handling [#1923](https://github.com/puppetlabs/puppetlabs-apache/pull/1923) ([FredL69](https://github.com/FredL69))
671711
- (MODULES-8931) Fix stahnma/epel failures [#1914](https://github.com/puppetlabs/puppetlabs-apache/pull/1914) ([eimlav](https://github.com/eimlav))
672712
- Fix wsgi_daemon_process to support hash data type [#1884](https://github.com/puppetlabs/puppetlabs-apache/pull/1884) ([mdechiaro](https://github.com/mdechiaro))
673713

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Contributing to Puppet modules
22

3-
Check out our [Contributing to Supported Modules Blog Post](https://puppetlabs.github.io/iac/docs/contributing_to_a_module.html) to find all the information that you will need.
3+
Check out our [Contributing to Puppet modules docs](https://help.puppet.com/core//current/Content/PuppetCore/contributing.htm) to find all the information that you will need.

Gemfile

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,50 +14,55 @@ def location_for(place_or_version, fake_version = nil)
1414
end
1515

1616
group :development do
17-
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
18-
gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
19-
gem "json", '= 2.5.1', require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2017
gem "json", '= 2.6.1', require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2118
gem "json", '= 2.6.3', require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2219
gem "racc", '~> 1.4.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2320
gem "deep_merge", '~> 1.2.2', require: false
2421
gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
25-
gem "facterdb", '~> 1.18', require: false
22+
gem "facterdb", '~> 2.1', require: false if Gem::Requirement.create(['< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
23+
gem "facterdb", '~> 3.0', require: false if Gem::Requirement.create(['>= 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2624
gem "metadata-json-lint", '~> 4.0', require: false
27-
gem "rspec-puppet-facts", '~> 2.0', require: false
25+
gem "json-schema", '< 5.1.1', require: false
26+
gem "rspec-puppet-facts", '~> 4.0', require: false if Gem::Requirement.create(['< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
27+
gem "rspec-puppet-facts", '~> 5.0', require: false if Gem::Requirement.create(['>= 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2828
gem "dependency_checker", '~> 1.0.0', require: false
2929
gem "parallel_tests", '= 3.12.1', require: false
3030
gem "pry", '~> 0.10', require: false
3131
gem "simplecov-console", '~> 0.9', require: false
32-
gem "puppet-debugger", '~> 1.0', require: false
32+
gem "puppet-debugger", '~> 1.6', require: false
3333
gem "rubocop", '~> 1.50.0', require: false
3434
gem "rubocop-performance", '= 1.16.0', require: false
3535
gem "rubocop-rspec", '= 2.19.0', require: false
3636
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
37-
gem "rexml", '>= 3.3.9', require: false
37+
gem "bigdecimal", '< 3.2.2', require: false, platforms: [:mswin, :mingw, :x64_mingw]
3838
end
3939
group :development, :release_prep do
4040
gem "puppet-strings", '~> 4.0', require: false
41-
gem "puppetlabs_spec_helper", '~> 7.0', require: false
41+
gem "puppetlabs_spec_helper", '~> 8.0', require: false
42+
gem "puppet-blacksmith", '~> 7.0', require: false
4243
end
4344
group :system_tests do
44-
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
45+
gem "puppet_litmus", '~> 2.0', require: false, platforms: [:ruby, :x64_mingw] if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
46+
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw] if ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
4547
gem "CFPropertyList", '< 3.0.7', require: false, platforms: [:mswin, :mingw, :x64_mingw]
4648
gem "serverspec", '~> 2.41', require: false
4749
end
4850

49-
puppet_version = ENV['PUPPET_GEM_VERSION']
50-
facter_version = ENV['FACTER_GEM_VERSION']
51-
hiera_version = ENV['HIERA_GEM_VERSION']
52-
5351
gems = {}
52+
puppet_version = ENV.fetch('PUPPET_GEM_VERSION', nil)
53+
facter_version = ENV.fetch('FACTER_GEM_VERSION', nil)
54+
hiera_version = ENV.fetch('HIERA_GEM_VERSION', nil)
5455

55-
gems['puppet'] = location_for(puppet_version)
56-
57-
# If facter or hiera versions have been specified via the environment
58-
# variables
56+
# If PUPPET_FORGE_TOKEN is set then use authenticated source for both puppet and facter, since facter is a transitive dependency of puppet
57+
# Otherwise, do as before and use location_for to fetch gems from the default source
58+
if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
59+
gems['puppet'] = ['~> 8.11', { require: false, source: 'https://rubygems-puppetcore.puppet.com' }]
60+
gems['facter'] = ['~> 4.11', { require: false, source: 'https://rubygems-puppetcore.puppet.com' }]
61+
else
62+
gems['puppet'] = location_for(puppet_version)
63+
gems['facter'] = location_for(facter_version) if facter_version
64+
end
5965

60-
gems['facter'] = location_for(facter_version) if facter_version
6166
gems['hiera'] = location_for(hiera_version) if hiera_version
6267

6368
gems.each do |gem_name, gem_params|

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@
278278
5. [Limitations - OS compatibility, etc.][Limitations]
279279
6. [License][License]
280280
7. [Development - Guide for contributing to the module][Development]
281-
281+
282282
<a id="module-description"></a>
283283
## Module description
284284

@@ -670,7 +670,7 @@ class { 'apache::mod::ssl':
670670
}
671671
```
672672

673-
You can also pass the different [`ssl_cipher`][] for different SSL protocols. This allows you to fine-tune the ciphers based on the specific SSL/TLS protocol version being used.
673+
You can also pass the different [`ssl_cipher`][] for different SSL protocols. This allows you to fine-tune the ciphers based on the specific SSL/TLS protocol version being used.
674674
```puppet
675675
class { 'apache::mod::ssl':
676676
ssl_cipher => {
@@ -693,7 +693,7 @@ apache::mod { 'mod_authnz_external': }
693693

694694
There are several optional parameters you can specify when defining Apache modules this way. See the [defined type's reference][`apache::mod`] for details.
695695

696-
<a id="load-balancing-examples"></a>
696+
<a id="load-balancing-examples"></a>
697697
### Load balancing examples
698698

699699
Apache supports load balancing across groups of servers through the [`mod_proxy`][] Apache module. Puppet supports configuring Apache load balancing groups (also known as balancer clusters) through the [`apache::balancer`][] and [`apache::balancermember`][] defined types.
@@ -741,7 +741,7 @@ apache::balancer { 'puppet01':
741741

742742
Load balancing scheduler algorithms (`lbmethod`) are listed [in mod_proxy_balancer documentation](https://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html).
743743

744-
<a id="reference"></a>
744+
<a id="reference"></a>
745745
## Reference
746746

747747
For information on classes, types and functions see the [REFERENCE.md](https://github.com/puppetlabs/puppetlabs-apache/blob/main/REFERENCE.md)
@@ -835,7 +835,7 @@ See [here](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linu
835835

836836
You must set the contexts using `semanage fcontext` instead of `chcon` because Puppet's `file` resources reset the values' context in the database if the resource doesn't specify it.
837837

838-
<a id="development"></a>
838+
<a id="development"></a>
839839
## Development
840840

841841
### Testing
@@ -863,7 +863,7 @@ COVERAGE=yes bundle exec rake parallel_spec
863863
Acceptance tests for this module leverage [puppet_litmus](https://github.com/puppetlabs/puppet_litmus).
864864
To run the acceptance tests follow the instructions [here](https://puppetlabs.github.io/litmus/Running-acceptance-tests.html). You can also find a tutorial and walkthrough of using Litmus and the PDK on [YouTube](https://www.youtube.com/watch?v=FYfR7ZEGHoE).
865865

866-
<a id="license"></a>
866+
<a id="license"></a>
867867
## License
868868

869869
This codebase is licensed under the Apache2.0 licensing, however due to the nature of the codebase the open source dependencies may also use a combination of [AGPL](https://opensource.org/license/agpl-v3/), [BSD-2](https://opensource.org/license/bsd-2-clause/), [BSD-3](https://opensource.org/license/bsd-3-clause/), [GPL2.0](https://opensource.org/license/gpl-2-0/), [LGPL](https://opensource.org/license/lgpl-3-0/), [MIT](https://opensource.org/license/mit/) and [MPL](https://opensource.org/license/mpl-2-0/) Licensing.
@@ -918,7 +918,7 @@ Please be aware of the following format guidelines for the tag:
918918
- E.g. `RedHat` OR `redhat`, not: `Red Hat Enterprise Linux`, `RHEL`, or `Red Hat`
919919

920920
If the tag is incorrectly formatted, a warning will be printed out at the end of the test run, indicating what tag(s) could not be parsed.
921-
This will not halt the execution of other tests.
921+
This will not halt the execution of other tests.
922922

923923
Once the class is tagged, it is possible to exclude a test for that particular [Apache MOD][Apache Modules] using RSpec's filtering and a helper method:
924924
```ruby

REFERENCE.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6072,6 +6072,7 @@ The following parameters are available in the `apache::mod::security` class:
60726072
* [`custom_rules_set`](#-apache--mod--security--custom_rules_set)
60736073
* [`modsec_dir`](#-apache--mod--security--modsec_dir)
60746074
* [`modsec_secruleengine`](#-apache--mod--security--modsec_secruleengine)
6075+
* [`debug_log_level`](#-apache--mod--security--debug_log_level)
60756076
* [`audit_log_relevant_status`](#-apache--mod--security--audit_log_relevant_status)
60766077
* [`audit_log_parts`](#-apache--mod--security--audit_log_parts)
60776078
* [`audit_log_type`](#-apache--mod--security--audit_log_type)
@@ -6170,6 +6171,14 @@ Configures the rules engine.
61706171

61716172
Default value: `$apache::params::modsec_secruleengine`
61726173

6174+
##### <a name="-apache--mod--security--debug_log_level"></a>`debug_log_level`
6175+
6176+
Data type: `Integer[0, 9]`
6177+
6178+
Configures the debug log level.
6179+
6180+
Default value: `0`
6181+
61736182
##### <a name="-apache--mod--security--audit_log_relevant_status"></a>`audit_log_relevant_status`
61746183

61756184
Data type: `String`
@@ -7910,6 +7919,8 @@ The following parameters are available in the `apache::vhost` defined type:
79107919
* [`mdomain`](#-apache--vhost--mdomain)
79117920
* [`proxy_requests`](#-apache--vhost--proxy_requests)
79127921
* [`userdir`](#-apache--vhost--userdir)
7922+
* [`proxy_protocol`](#-apache--vhost--proxy_protocol)
7923+
* [`proxy_protocol_exceptions`](#-apache--vhost--proxy_protocol_exceptions)
79137924

79147925
##### <a name="-apache--vhost--access_log"></a>`access_log`
79157926

@@ -10838,6 +10849,22 @@ Instances of apache::mod::userdir
1083810849

1083910850
Default value: `undef`
1084010851

10852+
##### <a name="-apache--vhost--proxy_protocol"></a>`proxy_protocol`
10853+
10854+
Data type: `Optional[Boolean]`
10855+
10856+
Enable or disable PROXY protocol handling
10857+
10858+
Default value: `undef`
10859+
10860+
##### <a name="-apache--vhost--proxy_protocol_exceptions"></a>`proxy_protocol_exceptions`
10861+
10862+
Data type: `Array[Stdlib::Host]`
10863+
10864+
Disable processing of PROXY header for certain hosts or networks
10865+
10866+
Default value: `[]`
10867+
1084110868
### <a name="apache--vhost--custom"></a>`apache::vhost::custom`
1084210869

1084310870
The `apache::vhost::custom` defined type is a thin wrapper around the `apache::custom_config` defined type, and simply overrides some of its default settings specific to the virtual host directory in Apache.

0 commit comments

Comments
 (0)