]> gitweb.fluxo.info Git - puppet-samba.git/commitdiff
Fix package names for rhel/centos using ads security
authorTomas Edwardsson <tommi@ok.is>
Tue, 30 Jul 2013 15:13:49 +0000 (15:13 +0000)
committerTomas Edwardsson <tommi@ok.is>
Tue, 30 Jul 2013 15:13:49 +0000 (15:13 +0000)
RHEL/CentOS use krb5-workstation instead of krb5-user as well
as samba-winbind instead of winbind package names.

manifests/server/ads.pp

index 1f8e6026d5128f3a2b15ef03b5032951521a1a2f..ea6523d45e69ae4cfff7b2f780fe7148efc26f04 100644 (file)
@@ -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'] ],