Skip to content

Commit 7057d3e

Browse files
author
sanfrancrisko
authored
Merge pull request #2127 from puppetlabs/release
(IAC-1467) Mergeback PR v5.10.0
2 parents 4bb4078 + 8e30d6a commit 7057d3e

File tree

3 files changed

+32
-4
lines changed

3 files changed

+32
-4
lines changed

CHANGELOG.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
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+
## [v5.10.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.10.0) (2021-02-16)
6+
7+
[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.9.0...v5.10.0)
8+
9+
### Added
10+
11+
- \(IAC-1186\) Add $use\_port\_for\_filenames parameter [\#2122](https://github.com/puppetlabs/puppetlabs-apache/pull/2122) ([smortex](https://github.com/smortex))
12+
13+
### Fixed
14+
15+
- \(MODULES-10899\) Handle PHP8 MOD package naming convention changes [\#2121](https://github.com/puppetlabs/puppetlabs-apache/pull/2121) ([sanfrancrisko](https://github.com/sanfrancrisko))
16+
517
## [v5.9.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v5.9.0) (2021-01-25)
618

719
[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v5.8.0...v5.9.0)
@@ -114,6 +126,7 @@ All notable changes to this project will be documented in this file. The format
114126
### Added
115127

116128
- \(FM-8672\) - Addition of Support for CentOS 8 [\#1977](https://github.com/puppetlabs/puppetlabs-apache/pull/1977) ([david22swan](https://github.com/david22swan))
129+
- \(MODULES-9948\) Allow switching of thread modules [\#1961](https://github.com/puppetlabs/puppetlabs-apache/pull/1961) ([tuxmea](https://github.com/tuxmea))
117130

118131
### Fixed
119132

@@ -129,7 +142,6 @@ All notable changes to this project will be documented in this file. The format
129142

130143
### Added
131144

132-
- \(MODULES-9948\) Allow switching of thread modules [\#1961](https://github.com/puppetlabs/puppetlabs-apache/pull/1961) ([tuxmea](https://github.com/tuxmea))
133145
- Add parameter version for mod security [\#1953](https://github.com/puppetlabs/puppetlabs-apache/pull/1953) ([tuxmea](https://github.com/tuxmea))
134146
- add possibility to define variables inside VirtualHost definition [\#1947](https://github.com/puppetlabs/puppetlabs-apache/pull/1947) ([trefzer](https://github.com/trefzer))
135147

REFERENCE.md

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5332,8 +5332,6 @@ Installs `mod_php`.
53325332

53335333
* **TODO** Add docs
53345334

5335-
* **Note** Unsupported platforms: SLES: all
5336-
53375335
#### Parameters
53385336

53395337
The following parameters are available in the `apache::mod::php` class:
@@ -7552,6 +7550,7 @@ The following parameters are available in the `apache::vhost` defined type:
75527550
* [`access_log_env_var`](#access_log_env_var)
75537551
* [`access_logs`](#access_logs)
75547552
* [`use_servername_for_filenames`](#use_servername_for_filenames)
7553+
* [`use_port_for_filenames`](#use_port_for_filenames)
75557554
* [`aliases`](#aliases)
75567555
* [`directories`](#directories)
75577556
* [`error_log`](#error_log)
@@ -8252,6 +8251,14 @@ Data type: `Optional[Boolean]`
82528251

82538252

82548253

8254+
Default value: ``false``
8255+
8256+
##### <a name="use_port_for_filenames"></a>`use_port_for_filenames`
8257+
8258+
Data type: `Optional[Boolean]`
8259+
8260+
8261+
82558262
Default value: ``false``
82568263

82578264
##### <a name="aliases"></a>`aliases`
@@ -9769,6 +9776,7 @@ The following parameters are available in the `apache::vhost::fragment` defined
97699776
* [`priority`](#priority)
97709777
* [`content`](#content)
97719778
* [`order`](#order)
9779+
* [`port`](#port)
97729780

97739781
##### <a name="vhost"></a>`vhost`
97749782

@@ -9802,6 +9810,14 @@ The order to insert the fragment at
98029810

98039811
Default value: `900`
98049812

9813+
##### <a name="port"></a>`port`
9814+
9815+
Data type: `Optional[Integer[0]]`
9816+
9817+
9818+
9819+
Default value: ``undef``
9820+
98059821
## Resource types
98069822

98079823
### <a name="a2mod"></a>`a2mod`

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": "5.9.0",
3+
"version": "5.10.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)