diff options
| author | Tomas Edwardsson <tommi@ok.is> | 2013-07-30 15:13:49 +0000 |
|---|---|---|
| committer | Tomas Edwardsson <tommi@ok.is> | 2013-07-30 15:13:49 +0000 |
| commit | db21d4cdaedbe63674bb837ce7a70c310919cd0a (patch) | |
| tree | 8761c86e1ca8d040c28950015eae77432fc86820 | |
| parent | d69032f73e0bf0d65072659c77a8fded1746c9db (diff) | |
| download | puppet-samba-db21d4cdaedbe63674bb837ce7a70c310919cd0a.tar.gz puppet-samba-db21d4cdaedbe63674bb837ce7a70c310919cd0a.tar.bz2 | |
Fix package names for rhel/centos using ads security
RHEL/CentOS use krb5-workstation instead of krb5-user as well
as samba-winbind instead of winbind package names.
| -rw-r--r-- | manifests/server/ads.pp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/manifests/server/ads.pp b/manifests/server/ads.pp index 1f8e602..ea6523d 100644 --- a/manifests/server/ads.pp +++ b/manifests/server/ads.pp @@ -25,10 +25,19 @@ class samba::server::ads($ensure = present, $map_readonly = 'no', $target_ou = 'Nix_Mashine') { + $krb5_user_package = $osfamily ? { + 'RedHat' => 'krb5-workstation', + default => 'krb5-user', + } + $winbind_package = $osfamily ? { + 'RedHat' => 'samba-winbind', + default => 'winbind', + } + package{ - 'krb5-user': ensure => installed; - 'winbind': ensure => installed; - 'expect': ensure => installed; + $krb5_user_package: ensure => installed; + $winbind_package: ensure => installed; + 'expect': ensure => installed; } include samba::server::config @@ -88,7 +97,7 @@ class samba::server::ads($ensure = present, group => root, mode => "0755", content => template("${module_name}/verify_active_directory.erb"), - require => [ Package['krb5-user', 'winbind', 'expect'], + require => [ Package[$krb5_user_package, $winbind_package, 'expect'], Augeas['samba-realm', 'samba-security', 'samba-winbind enum users', 'samba-winbind enum groups', 'samba-winbind uid', 'samba-winbind gid', 'samba-winbind use default domain'] ], @@ -101,7 +110,7 @@ class samba::server::ads($ensure = present, group => root, mode => "0755", content => template("${module_name}/configure_active_directory.erb"), - require => [ Package['krb5-user', 'winbind', 'expect'], + require => [ Package[$krb5_user_package, $winbind_package, 'expect'], Augeas['samba-realm', 'samba-security', 'samba-winbind enum users', 'samba-winbind enum groups', 'samba-winbind uid', 'samba-winbind gid', 'samba-winbind use default domain'] ], |