Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

puppetlabs/apache: Require 8.x; switch apache ports from string to int #835

Merged
merged 3 commits into from
Aug 10, 2022
Merged

puppetlabs/apache: Require 8.x; switch apache ports from string to int #835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58b265e
Stop breaking upstream apache rspec
Aug 9, 2022
42007ae
puppetlabs/apache: Require 8.x
bastelfreak Aug 10, 2022
1c5b3d8
apache ports: use same type as in puppetlabs/apache
bastelfreak Aug 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,8 @@
$apache_ssl_cipher = $zabbix::params::apache_ssl_cipher,
$apache_ssl_chain = $zabbix::params::apache_ssl_chain,
$apache_listen_ip = $zabbix::params::apache_listen_ip,
$apache_listenport = $zabbix::params::apache_listenport,
$apache_listenport_ssl = $zabbix::params::apache_listenport_ssl,
Variant[Array[Stdlib::Port], Stdlib::Port] $apache_listenport = $zabbix::params::apache_listenport,
Variant[Array[Stdlib::Port], Stdlib::Port] $apache_listenport_ssl = $zabbix::params::apache_listenport_ssl,
$apache_php_max_execution_time = $zabbix::params::apache_php_max_execution_time,
$apache_php_memory_limit = $zabbix::params::apache_php_memory_limit,
$apache_php_post_max_size = $zabbix::params::apache_php_post_max_size,
Expand Down
4 changes: 2 additions & 2 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@

# Zabbix-web
$apache_listen_ip = undef
$apache_listenport = '80'
$apache_listenport_ssl = '443'
$apache_listenport = 80
$apache_listenport_ssl = 443
$apache_ssl_cert = undef
$apache_ssl_chain = undef
# Cipher is used from: https://wiki.mozilla.org/Security/Server_Side_TLS#Modern_compatibility
Expand Down
4 changes: 2 additions & 2 deletions manifests/web.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@
$apache_ssl_cipher = $zabbix::params::apache_ssl_cipher,
$apache_ssl_chain = $zabbix::params::apache_ssl_chain,
$apache_listen_ip = $zabbix::params::apache_listen_ip,
$apache_listenport = $zabbix::params::apache_listenport,
$apache_listenport_ssl = $zabbix::params::apache_listenport_ssl,
Variant[Array[Stdlib::Port], Stdlib::Port] $apache_listenport = $zabbix::params::apache_listenport,
Variant[Array[Stdlib::Port], Stdlib::Port] $apache_listenport_ssl = $zabbix::params::apache_listenport_ssl,
$zabbix_api_user = $zabbix::params::server_api_user,
$zabbix_api_pass = $zabbix::params::server_api_pass,
$database_host = $zabbix::params::server_database_host,
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
{
"name": "puppetlabs/apache",
"version_requirement": ">= 1.6.0 < 7.0.0"
"version_requirement": ">= 8.0.0 < 9.0.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It wasn't needed to change the lower bound so strict. This can cause problems for users who haven't updated all their yet. The old versions accepted integers just fine.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I must agree that the lower bound is quite aggressive 😄

},
{
"name": "puppetlabs/firewall",
Expand Down