aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Tölke <pt@philipptoelke.de>2016-06-09 15:44:11 +0200
committerfos4X root <root@fos4x.de>2016-06-09 15:44:11 +0200
commit20085c8866294ab0b3c05d514f03e9819f4900b2 (patch)
tree9088e2d253c1ed467e63cc2b2dec4522125fb850
parenteb97a2b642499fde7afdb64dfd3e2b7e8c14eacc (diff)
downloadpuppet-samba-20085c8866294ab0b3c05d514f03e9819f4900b2.tar.gz
puppet-samba-20085c8866294ab0b3c05d514f03e9819f4900b2.tar.bz2
Add parameter to disable automatic join of domain
-rw-r--r--manifests/server/ads.pp15
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'] ],
+ }
}
}