Merge pull request #835 from bdeferme/apache_ports_breaks_rspec

puppetlabs/apache: Require 8.x; switch apache ports from string to int
voxpupuli · Aug 10, 2022 · e233bc3 · e233bc3
2 parents a59f433 + 1c5b3d8
commit e233bc3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -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,

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -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

diff --git a/manifests/web.pp b/manifests/web.pp
@@ -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,

diff --git a/metadata.json b/metadata.json
@@ -18,7 +18,7 @@
     },
     {
       "name": "puppetlabs/apache",
-      "version_requirement": ">= 1.6.0 < 7.0.0"
+      "version_requirement": ">= 8.0.0 < 9.0.0"
     },
     {
       "name": "puppetlabs/firewall",