feat: non-empty strings for LDAP parameters

Signed-off-by: Francesco Di Nucci <[email protected]>
voxpupuli · Nov 26, 2024 · bf8b2eb · bf8b2eb
1 parent ab66bcc
commit bf8b2eb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/manifests/apache/conf.pp b/manifests/apache/conf.pp
@@ -36,10 +36,10 @@
   Optional[String[1]] $ldap_bind_authoritative = undef,
   Boolean $ldap_require_group                  = $puppetboard::ldap_require_group,
   Optional[String[1]] $ldap_require_group_dn   = undef,
-  Optional[String] $ldap_require_user          = undef,
-  Optional[String] $ldap_require_dn            = undef,
-  Optional[String] $ldap_require_attribute     = undef,
-  Optional[String] $ldap_require_filter        = undef,
+  Optional[String[1]] $ldap_require_user          = undef,
+  Optional[String[1]] $ldap_require_dn            = undef,
+  Optional[String[1]] $ldap_require_attribute     = undef,
+  Optional[String[1]] $ldap_require_filter        = undef,
   Stdlib::Absolutepath $virtualenv_dir         = $puppetboard::virtualenv_dir,
 ) {
   $wsgi = $facts['os']['family'] ? {

diff --git a/manifests/apache/vhost.pp b/manifests/apache/vhost.pp
@@ -47,10 +47,10 @@
   Optional[String[1]] $ldap_bind_authoritative = undef,
   Boolean $ldap_require_group                  = $puppetboard::ldap_require_group,
   Optional[String[1]] $ldap_require_group_dn   = undef,
-  Optional[String] $ldap_require_user          = undef,
-  Optional[String] $ldap_require_dn            = undef,
-  Optional[String] $ldap_require_attribute     = undef,
-  Optional[String] $ldap_require_filter        = undef,
+  Optional[String[1]] $ldap_require_user          = undef,
+  Optional[String[1]] $ldap_require_dn            = undef,
+  Optional[String[1]] $ldap_require_attribute     = undef,
+  Optional[String[1]] $ldap_require_filter        = undef,
   Stdlib::Absolutepath $virtualenv_dir         = $puppetboard::virtualenv_dir,
   Hash $custom_apache_parameters               = {},
 ) {