diff --git a/manifests/init.pp b/manifests/init.pp index 9bc4e66..edbf76a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -2,32 +2,32 @@ # # This class manages the nslcd server and service. class nslcd ( - Variant[Boolean,String[1]] $package_ensure = $nslcd::params::package_ensure, + Variant[Boolean,String[1]] $package_ensure = 'present', String[1] $package_name = $nslcd::params::package_name, - Boolean $package_manage = $nslcd::params::package_manage, - Variant[Boolean,Enum['stopped','running']] $service_ensure = $nslcd::params::service_ensure, - Boolean $service_enable = $nslcd::params::service_enable, - String[1] $service_name = $nslcd::params::service_name, - Boolean $service_manage = $nslcd::params::service_manage, - String[1] $uid = $nslcd::params::uid, + 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 = $nslcd::params::config, - String[1] $config_user = $nslcd::params::config_user, + 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 = $nslcd::params::ldap_uris, - Enum['2','3'] $ldap_version = $nslcd::params::ldap_version, - Optional[String[1]] $ldap_binddn = $nslcd::params::ldap_binddn, - Optional[String[1]] $ldap_bindpw = $nslcd::params::ldap_bindpw, - Optional[String[1]] $ldap_search_base = $nslcd::params::ldap_search_base, - Optional[String[1]] $ldap_group_base = $nslcd::params::ldap_group_base, - Enum['sub','subtree','one','onelevel','base'] $ldap_search_scope = $nslcd::params::ldap_search_scope, - Hash $config_options = $nslcd::params::config_options, - Hash $ldap_filters = $nslcd::params::ldap_filters, - Hash $ldap_maps = $nslcd::params::ldap_maps, - Enum['on','off','start_tls'] $ldap_ssl = $nslcd::params::ldap_ssl, - Enum['never','allow','try','demand','hard' ] $ldap_tls_reqcert = $nslcd::params::ldap_tls_reqcert, - Optional[String[1]] $ldap_tls_cacertfile = $nslcd::params::ldap_tls_cacertfile, + 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 { anchor { 'nslcd::begin': } diff --git a/manifests/params.pp b/manifests/params.pp index 54172b2..68bddf6 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -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' }