aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Döring <christian.doering@cornelsen-schulverlage.de>2016-02-02 17:45:52 +0100
committerAdam Jahn <ajjahn@gmail.com>2016-02-05 11:40:58 -0500
commit9c84eb144deeeb67001e9cc95101f48d77e43501 (patch)
tree0a315007fb76703a0b7e22037d57dd63e51a5a96
parent6b84cf51c863034c2dbba12f380bf8e82a529abb (diff)
downloadpuppet-samba-9c84eb144deeeb67001e9cc95101f48d77e43501.tar.gz
puppet-samba-9c84eb144deeeb67001e9cc95101f48d77e43501.tar.bz2
Enable global guest-account setting
-rw-r--r--manifests/server.pp4
-rw-r--r--manifests/server/share.pp5
2 files changed, 3 insertions, 6 deletions
diff --git a/manifests/server.pp b/manifests/server.pp
index 8a5853c..027471c 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -12,7 +12,8 @@ class samba::server($interfaces = '',
$load_printers = '',
$printing = '',
$printcap_name = '',
- $map_to_guest = '',
+ $map_to_guest = 'Never',
+ $guest_account = '',
$disable_spoolss = '',
$kernel_oplocks = '',
$pam_password_change = '',
@@ -52,6 +53,7 @@ class samba::server($interfaces = '',
'printing': value => $printing;
'printcap name': value => $printcap_name;
'map to guest': value => $map_to_guest;
+ 'guest account': value => $guest_account;
'disable spoolss': value => $disable_spoolss;
'kernel oplocks': value => $kernel_oplocks;
'pam password change': value => $pam_password_change;
diff --git a/manifests/server/share.pp b/manifests/server/share.pp
index c682055..e5e23f1 100644
--- a/manifests/server/share.pp
+++ b/manifests/server/share.pp
@@ -11,7 +11,6 @@ define samba::server::share($ensure = present,
$force_directory_mask = '',
$force_group = '',
$force_user = '',
- $guest_account = '',
$guest_ok = '',
$guest_only = '',
$hide_unreadable = '',
@@ -94,10 +93,6 @@ define samba::server::share($ensure = present,
'' => "rm \"${target}/force user\"",
default => "set \"${target}/force user\" '${force_user}'",
},
- $guest_account ? {
- '' => "rm \"${target}/guest account\"",
- default => "set \"${target}/guest account\" '${guest_account}'",
- },
$guest_ok ? {
true => "set \"${target}/guest ok\" yes",
false => "set \"${target}/guest ok\" no",