Merge pull request #18 from natemccurdy/param_types

Improve the class parameters and switch to proper containment
This commit is contained in:
Geekix 2019-03-10 10:28:11 +01:00 committed by GitHub
commit 498adf96f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 75 deletions

View File

@ -2,49 +2,40 @@
#
# This class manages the nslcd server and service.
class nslcd (
$package_ensure = $nslcd::params::package_ensure,
$package_name = $nslcd::params::package_name,
$package_manage = $nslcd::params::package_manage,
$service_ensure = $nslcd::params::service_ensure,
$service_enable = $nslcd::params::service_enable,
$service_name = $nslcd::params::service_name,
$service_manage = $nslcd::params::service_manage,
$uid = $nslcd::params::uid,
$gid = $nslcd::params::gid,
$config = $nslcd::params::config,
$config_user = $nslcd::params::config_user,
$config_group = $nslcd::params::config_group,
$config_mode = $nslcd::params::config_mode,
$ldap_uris = $nslcd::params::ldap_uris,
$ldap_version = $nslcd::params::ldap_version,
$ldap_binddn = $nslcd::params::ldap_binddn,
$ldap_bindpw = $nslcd::params::ldap_bindpw,
$ldap_search_base = $nslcd::params::ldap_search_base,
$ldap_group_base = $nslcd::params::ldap_group_base,
$ldap_search_scope = $nslcd::params::ldap_search_scope,
$config_options = $nslcd::params::config_options,
$ldap_filters = $nslcd::params::ldap_filters,
$ldap_maps = $nslcd::params::ldap_maps,
$ldap_ssl = $nslcd::params::ldap_ssl,
$ldap_tls_reqcert = $nslcd::params::ldap_tls_reqcert,
$ldap_tls_cacertfile = $nslcd::params::ldap_tls_cacertfile,
Variant[Boolean,String[1]] $package_ensure = 'present',
String[1] $package_name = $nslcd::params::package_name,
Boolean $package_manage = true,
Variant[Boolean,Enum['stopped','running']] $service_ensure = 'running',
Boolean $service_enable = true,
String[1] $service_name = 'nslcd',
Boolean $service_manage = true,
String[1] $uid = 'nslcd',
String[1] $gid = $nslcd::params::gid,
Stdlib::Unixpath $config = '/etc/nslcd.conf',
String[1] $config_user = 'root',
String[1] $config_group = $nslcd::params::config_group,
Stdlib::Filemode $config_mode = $nslcd::params::config_mode,
Array[String[1]] $ldap_uris = ['ldap:///'],
Enum['2','3'] $ldap_version = '3',
Optional[String[1]] $ldap_binddn = undef,
Optional[String[1]] $ldap_bindpw = undef,
Optional[String[1]] $ldap_search_base = undef,
Optional[String[1]] $ldap_group_base = undef,
Enum['sub','subtree','one','onelevel','base'] $ldap_search_scope = 'subtree',
Hash $config_options = {},
Hash $ldap_filters = {},
Hash $ldap_maps = {},
Enum['on','off','start_tls'] $ldap_ssl = 'off',
Enum['never','allow','try','demand','hard' ] $ldap_tls_reqcert = 'allow',
Optional[String[1]] $ldap_tls_cacertfile = undef,
) inherits nslcd::params {
# Input validation
$valid_ldap_versions = [ '2', '3' ]
$valid_ldap_ssl = [ 'on', 'off', 'start_tls' ]
$valid_ldap_tls_reqcert = [ 'never', 'allow', 'try', 'demand', 'hard' ]
$valid_ldap_search_scope = [ 'sub', 'subtree', 'one', 'onelevel', 'base' ]
contain nslcd::install
contain nslcd::config
contain nslcd::service
validate_re($ldap_version, $valid_ldap_versions)
validate_re($ldap_ssl, $valid_ldap_ssl)
validate_re($ldap_tls_reqcert, $valid_ldap_tls_reqcert)
validate_re($ldap_search_scope, $valid_ldap_search_scope)
anchor { 'nslcd::begin': }
-> class { 'nslcd::install': }
-> class { 'nslcd::config': }
~> class { 'nslcd::service': }
-> anchor { 'nslcd::end': }
Class['nslcd::install']
-> Class['nslcd::config']
~> Class['nslcd::service']
}

View File

@ -3,48 +3,16 @@
# Sets the default parameters for the nslcd class.
class nslcd::params {
$package_ensure = present
$package_manage = true
$service_ensure = running
$service_enable = true
$service_manage = true
$ldap_uris = ['ldap:///']
$ldap_version = '3'
$ldap_binddn = undef
$ldap_bindpw = undef
$ldap_search_base = undef
$ldap_group_base = undef
$ldap_search_scope = 'subtree'
$config_options = {}
$ldap_filters = {}
$ldap_maps = {}
$ldap_ssl = 'off'
$ldap_tls_reqcert = 'allow'
$ldap_tls_cacertfile = undef
$default_config = '/etc/nslcd.conf'
$default_package_name = 'nslcd'
$default_service_name = 'nslcd'
case $::osfamily {
'Debian': {
$config = $default_config
$package_name = $default_package_name
$service_name = $default_service_name
$uid = 'nslcd'
$package_name = 'nslcd'
$gid = 'nslcd'
$config_user = 'root'
$config_group = 'nslcd'
$config_mode = '0640'
}
'RedHat': {
$config = $default_config
$package_name = 'nss-pam-ldapd'
$service_name = $default_service_name
$uid = 'nslcd'
$gid = 'ldap'
$config_user = 'root'
$config_group = 'root'
$config_mode = '0600'
}

View File

@ -26,7 +26,7 @@
"operatingsystemrelease": [
"14.04",
"16.04",
"18.04"
"18.04"
]
}
],