diff options
| author | Adam Jahn <ajjahn@gmail.com> | 2016-07-01 11:54:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-01 11:54:59 -0400 |
| commit | 660ef675107a60de16c6daeaccce6731a5139658 (patch) | |
| tree | d30beae0e85f8100ad36f3f126fb6d7626c352d8 /manifests | |
| parent | 3ffd1bcbc1d203ad814038483cd49d332bbb7618 (diff) | |
| parent | 22c8f66ffaee96ab61465331d0d14636e5312ae6 (diff) | |
| download | puppet-samba-660ef675107a60de16c6daeaccce6731a5139658.tar.gz puppet-samba-660ef675107a60de16c6daeaccce6731a5139658.tar.bz2 | |
Merge pull request #61 from toelke/master
Add parameter to disable automatic join of domain
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/server/ads.pp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/manifests/server/ads.pp b/manifests/server/ads.pp index 757d091..d7d462c 100644 --- a/manifests/server/ads.pp +++ b/manifests/server/ads.pp @@ -21,7 +21,8 @@ class samba::server::ads($ensure = present, $map_system = 'no', $map_archive = 'no', $map_readonly = 'no', - $target_ou = 'Nix_Mashine') { + $target_ou = 'Nix_Mashine', + $perform_join = true) { $krb5_user_package = $::osfamily ? { 'RedHat' => 'krb5-workstation', @@ -122,10 +123,12 @@ class samba::server::ads($ensure = present, 'samba-winbind use default domain'], Service['winbind'] ], } - exec {'join-active-directory': - # join the domain configured in samba.conf - command => '/sbin/configure_active_directory -j', - unless => '/sbin/verify_active_directory', - require => [ File['configure_active_directory', 'verify_active_directory'], Service['winbind'] ], + if ($perform_join) { + exec {'join-active-directory': + # join the domain configured in samba.conf + command => '/sbin/configure_active_directory -j', + unless => '/sbin/verify_active_directory', + require => [ File['configure_active_directory', 'verify_active_directory'], Service['winbind'] ], + } } } |