Skip to content

Commit 28b2d0f

Browse files
authored
Merge pull request #2407 from puppetlabs/release-prep
Release prep v10.0.0
2 parents 38945c5 + 6977122 commit 28b2d0f

File tree

3 files changed

+19
-13
lines changed

3 files changed

+19
-13
lines changed

CHANGELOG.md

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,21 @@
22

33
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).
44

5-
## [v9.1.3](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.1.3) - 2023-04-20
5+
## [v10.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v10.0.0) (2023-04-21)
6+
7+
[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v9.1.3...v10.0.0)
8+
9+
### Changed
10+
11+
- \(CONT-772\) Puppet 8 support / Drop Puppet 6 [\#2405](https://github.com/puppetlabs/puppetlabs-apache/pull/2405) ([LukasAud](https://github.com/LukasAud))
12+
13+
## [v9.1.3](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.1.3) (2023-04-20)
614

715
[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v9.1.2...v9.1.3)
816

917
### Fixed
1018

11-
- #2391 Allow Sensitive type in addition to String type [#2392](https://github.com/puppetlabs/puppetlabs-apache/pull/2392) ([dpavlotzky](https://github.com/dpavlotzky))
12-
19+
- \#2391 Allow Sensitive type in addition to String type [\#2392](https://github.com/puppetlabs/puppetlabs-apache/pull/2392) ([dpavlotzky](https://github.com/dpavlotzky))
1320

1421
## [v9.1.2](https://github.com/puppetlabs/puppetlabs-apache/tree/v9.1.2) (2023-02-10)
1522

@@ -65,6 +72,10 @@ All notable changes to this project will be documented in this file. The format
6572
- Drop deprecated a2mod type/providers [\#2350](https://github.com/puppetlabs/puppetlabs-apache/pull/2350) ([bastelfreak](https://github.com/bastelfreak))
6673
- Drop Apache 2.2 support [\#2329](https://github.com/puppetlabs/puppetlabs-apache/pull/2329) ([ekohl](https://github.com/ekohl))
6774

75+
### Fixed
76+
77+
- fix mod\_proxy\_html on FreeBSD [\#2355](https://github.com/puppetlabs/puppetlabs-apache/pull/2355) ([fraenki](https://github.com/fraenki))
78+
6879
## [v8.6.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.6.0) (2022-12-14)
6980

7081
[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.5.0...v8.6.0)
@@ -73,10 +84,6 @@ All notable changes to this project will be documented in this file. The format
7384

7485
- Parameterize SecRequestBodyLimitAction and SecResponseBodyLimitAction [\#2353](https://github.com/puppetlabs/puppetlabs-apache/pull/2353) ([Vincevrp](https://github.com/Vincevrp))
7586

76-
### Fixed
77-
78-
- fix mod\_proxy\_html on FreeBSD [\#2355](https://github.com/puppetlabs/puppetlabs-apache/pull/2355) ([fraenki](https://github.com/fraenki))
79-
8087
## [v8.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v8.5.0) (2022-12-06)
8188

8289
[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v8.4.0...v8.5.0)
@@ -357,6 +364,7 @@ All notable changes to this project will be documented in this file. The format
357364

358365
- \(fix\) Convert unnecessary multi line warnings to single lines [\#2104](https://github.com/puppetlabs/puppetlabs-apache/pull/2104) ([rj667](https://github.com/rj667))
359366
- Fix bool2httpd function call for older ruby versions [\#2102](https://github.com/puppetlabs/puppetlabs-apache/pull/2102) ([carabasdaniel](https://github.com/carabasdaniel))
367+
- Use Ruby 2.7 compatible string matching [\#2060](https://github.com/puppetlabs/puppetlabs-apache/pull/2060) ([ekohl](https://github.com/ekohl))
360368

361369
## [v5.7.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.7.0) (2020-11-24)
362370

@@ -389,7 +397,6 @@ All notable changes to this project will be documented in this file. The format
389397

390398
- make apache::mod::fcgid redhat 8 compatible [\#2071](https://github.com/puppetlabs/puppetlabs-apache/pull/2071) ([creativefre](https://github.com/creativefre))
391399
- pdksync - \(feat\) - Removal of inappropriate terminology [\#2062](https://github.com/puppetlabs/puppetlabs-apache/pull/2062) ([pmcmaw](https://github.com/pmcmaw))
392-
- Use Ruby 2.7 compatible string matching [\#2060](https://github.com/puppetlabs/puppetlabs-apache/pull/2060) ([ekohl](https://github.com/ekohl))
393400
- Use python3-mod\_wsgi instead of mod\_wsgi on CentOS8 [\#2052](https://github.com/puppetlabs/puppetlabs-apache/pull/2052) ([kajinamit](https://github.com/kajinamit))
394401

395402
## [v5.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.5.0) (2020-07-03)
@@ -545,7 +552,6 @@ All notable changes to this project will be documented in this file. The format
545552

546553
- \(MODULES-5990\) - conf-enabled defaulted to undef [\#1869](https://github.com/puppetlabs/puppetlabs-apache/pull/1869) ([david22swan](https://github.com/david22swan))
547554
- pdksync - \(FM-7655\) Fix rubygems-update for ruby \< 2.3 [\#1866](https://github.com/puppetlabs/puppetlabs-apache/pull/1866) ([tphoney](https://github.com/tphoney))
548-
- \(FM-7605\) - Disabling conf\_enabled on Ubuntu 18.04 by default as it conflicts with Shibboleth causing errors with apache2. [\#1856](https://github.com/puppetlabs/puppetlabs-apache/pull/1856) ([david22swan](https://github.com/david22swan))
549555

550556
## [3.5.0](https://github.com/puppetlabs/puppetlabs-apache/tree/3.5.0) (2018-12-17)
551557

@@ -560,6 +566,7 @@ All notable changes to this project will be documented in this file. The format
560566

561567
### Fixed
562568

569+
- \(FM-7605\) - Disabling conf\_enabled on Ubuntu 18.04 by default as it conflicts with Shibboleth causing errors with apache2. [\#1856](https://github.com/puppetlabs/puppetlabs-apache/pull/1856) ([david22swan](https://github.com/david22swan))
563570
- \(MODULES-8429\) Update GPG key for phusion passenger [\#1848](https://github.com/puppetlabs/puppetlabs-apache/pull/1848) ([abottchen](https://github.com/abottchen))
564571
- Fix default vhost priority in readme [\#1843](https://github.com/puppetlabs/puppetlabs-apache/pull/1843) ([HT43-bqxFqB](https://github.com/HT43-bqxFqB))
565572
- fix apache::mod::jk example typo and add link for more info [\#1812](https://github.com/puppetlabs/puppetlabs-apache/pull/1812) ([xorpaul](https://github.com/xorpaul))
@@ -588,7 +595,6 @@ All notable changes to this project will be documented in this file. The format
588595
- pdksync - \(MODULES-7705\) - Bumping stdlib dependency from \< 5.0.0 to \< 6.0.0 [\#1821](https://github.com/puppetlabs/puppetlabs-apache/pull/1821) ([pmcmaw](https://github.com/pmcmaw))
589596
- Add support for ProxyTimeout [\#1805](https://github.com/puppetlabs/puppetlabs-apache/pull/1805) ([agoodno](https://github.com/agoodno))
590597
- \(MODULES-7343\) - Allow overrides by adding mod\_libs in apache class [\#1800](https://github.com/puppetlabs/puppetlabs-apache/pull/1800) ([karelyatin](https://github.com/karelyatin))
591-
- Rework passenger VHost and Directories [\#1778](https://github.com/puppetlabs/puppetlabs-apache/pull/1778) ([smortex](https://github.com/smortex))
592598

593599
### Fixed
594600

REFERENCE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6665,7 +6665,7 @@ Installs and configures `mod_status`.
66656665
```puppet
66666666
# Simple usage allowing access from localhost and a private subnet
66676667
class { 'apache::mod::status':
6668-
$requires => 'ip 127.0.0.1 ::1 10.10.10.10/24',
6668+
requires => 'ip 127.0.0.1 ::1 10.10.10.10/24',
66696669
}
66706670
```
66716671

@@ -7281,7 +7281,7 @@ Default value: `$apache::confd_dir`
72817281

72827282
##### <a name="-apache--custom_config--content"></a>`content`
72837283

7284-
Data type: `Optional[String]`
7284+
Data type: `Optional[Variant[Sensitive, String]]`
72857285

72867286
Sets the configuration file's content. The `content` and `source` parameters are exclusive
72877287
of each other.

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "puppetlabs-apache",
3-
"version": "9.1.3",
3+
"version": "10.0.0",
44
"author": "puppetlabs",
55
"summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
66
"license": "Apache-2.0",

0 commit comments

Comments
 (0)