Merge pull request #2359 from david22swan/GH-2291/small_changes

(GH-2291) Further refine types
puppetlabs · Dec 15, 2022 · 5b88f17 · 5b88f17
2 parents e8ba891 + 29bd2e0
commit 5b88f17
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/manifests/mod/auth_cas.pp b/manifests/mod/auth_cas.pp
@@ -87,28 +87,28 @@
 class apache::mod::auth_cas (
   String $cas_login_url,
   String $cas_validate_url,
-  String $cas_cookie_path                                = $apache::params::cas_cookie_path,
-  Stdlib::Filemode $cas_cookie_path_mode                 = '0750',
-  Integer $cas_version                                   = 2,
-  String $cas_debug                                      = 'Off',
-  Optional[String] $cas_validate_server                  = undef,
-  Optional[String] $cas_validate_depth                   = undef,
-  Optional[String] $cas_certificate_path                 = undef,
-  Optional[String] $cas_proxy_validate_url               = undef,
-  Optional[String] $cas_root_proxied_as                  = undef,
-  Optional[String] $cas_cookie_entropy                   = undef,
-  Optional[Variant[Integer[0],String]] $cas_timeout      = undef,
-  Optional[Variant[Integer[0],String]] $cas_idle_timeout = undef,
-  Optional[String] $cas_cache_clean_interval             = undef,
-  Optional[String] $cas_cookie_domain                    = undef,
-  Optional[String] $cas_cookie_http_only                 = undef,
-  Optional[String] $cas_authoritative                    = undef,
-  Optional[String] $cas_validate_saml                    = undef,
-  Optional[String] $cas_sso_enabled                      = undef,
-  Optional[String] $cas_attribute_prefix                 = undef,
-  Optional[String] $cas_attribute_delimiter              = undef,
-  Optional[String] $cas_scrub_request_headers            = undef,
-  Boolean $suppress_warning                              = false,
+  String $cas_cookie_path                     = $apache::params::cas_cookie_path,
+  Stdlib::Filemode $cas_cookie_path_mode      = '0750',
+  Integer $cas_version                        = 2,
+  String $cas_debug                           = 'Off',
+  Optional[String] $cas_validate_server       = undef,
+  Optional[String] $cas_validate_depth        = undef,
+  Optional[String] $cas_certificate_path      = undef,
+  Optional[String] $cas_proxy_validate_url    = undef,
+  Optional[String] $cas_root_proxied_as       = undef,
+  Optional[String] $cas_cookie_entropy        = undef,
+  Optional[Integer[0]] $cas_timeout           = undef,
+  Optional[Integer[0]] $cas_idle_timeout      = undef,
+  Optional[String] $cas_cache_clean_interval  = undef,
+  Optional[String] $cas_cookie_domain         = undef,
+  Optional[String] $cas_cookie_http_only      = undef,
+  Optional[String] $cas_authoritative         = undef,
+  Optional[String] $cas_validate_saml         = undef,
+  Optional[String] $cas_sso_enabled           = undef,
+  Optional[String] $cas_attribute_prefix      = undef,
+  Optional[String] $cas_attribute_delimiter   = undef,
+  Optional[String] $cas_scrub_request_headers = undef,
+  Boolean $suppress_warning                   = false,
 ) inherits apache::params {
   if $facts['os']['family'] == 'RedHat' and ! $suppress_warning {
     warning('RedHat distributions do not have Apache mod_auth_cas in their default package repositories.')

diff --git a/manifests/mod/proxy.pp b/manifests/mod/proxy.pp
@@ -22,12 +22,12 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy.html for additional documentation.
 #
 class apache::mod::proxy (
-  String $proxy_requests                              = 'Off',
-  Optional[Stdlib::IP::Address] $allow_from           = undef,
-  Optional[String] $package_name                      = undef,
-  String $proxy_via                                   = 'On',
-  Optional[Variant[Integer[0],String]] $proxy_timeout = undef,
-  Optional[String] $proxy_iobuffersize                = undef,
+  String $proxy_requests                    = 'Off',
+  Optional[Stdlib::IP::Address] $allow_from = undef,
+  Optional[String] $package_name            = undef,
+  String $proxy_via                         = 'On',
+  Optional[Integer[0]] $proxy_timeout       = undef,
+  Optional[String] $proxy_iobuffersize      = undef,
 ) {
   include apache
   $_proxy_timeout = $apache::timeout