Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
# NIS Domain
#
# [*nisserver*]
# NIS Server
# NIS Server. Pass a string or an array.
#
# [*shadow*]
# Enable shadow password
Expand Down Expand Up @@ -148,7 +148,7 @@
$nis = false,
$nisdomain = undef,
$nisserver = undef,
$passalgo = 'md5',
$passalgo = 'sha512',
$shadow = true,
$krb5 = false,
$krb5realm = undef,
Expand Down Expand Up @@ -277,16 +277,13 @@
$nisdomain_val = "--nisdomain=${nisdomain}"
}

if $nisserver {
if (is_array($nisserver)) {
$niss_joined = join($nisserver, ',')
$nisserver_val = "--nisserver=${niss_joined}"
} else {
$nisserver_val = "--nisserver=${nisserver}"
}

# MD5
$md5_flg = $passalgo ? {
'md5' => '--enablemd5',
default => '--disablemd5',
}

# hash/crypt algorithm for new passwords
if $passalgo {
$passalgo_val = "--passalgo=${passalgo}"
Expand Down Expand Up @@ -482,7 +479,7 @@

$extra_flags = "${preferdns_flg} ${forcelegacy_flg} ${pamaccess_flg}"

$pass_flags = "${md5_flg} ${passalgo_val} ${shadow_flg}"
$pass_flags = "${passalgo_val} ${shadow_flg}"
$authconfig_flags = "${ldap_flags} ${nis_flags} ${pass_flags} ${krb5_flags} ${winbind_flags} ${extra_flags} ${cache_flg} ${mkhomedir_flg} ${sssd_flg} ${sssdauth_flg} ${rfc2307bis_flg} ${locauthorize_flg} ${sysnetauth_flg} ${smartcard_flags}"
$authconfig_update_cmd = "authconfig ${authconfig_flags} --updateall"
$authconfig_test_cmd = "authconfig ${authconfig_flags} --test"
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/authconfig_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{
'nis' => false,
'shadow' => true,
'passalgo' => 'md5',
'passalgo' => 'sha512',
}
end

Expand Down