aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jahn <ajjahn@gmail.com>2016-02-15 11:27:47 -0500
committerAdam Jahn <ajjahn@gmail.com>2016-02-15 11:27:47 -0500
commit3cc71eaac5e120a2b4e5be339b6eb4e3d78349c1 (patch)
treee5596b1c4f71061d8bb8d1d6fae2fd934d2ce0a9
parent430054887e7894690524bcd7d4a629280f18479f (diff)
parent2e78387a530b2c987bf3c26712f30a641abd2081 (diff)
downloadpuppet-samba-3cc71eaac5e120a2b4e5be339b6eb4e3d78349c1.tar.gz
puppet-samba-3cc71eaac5e120a2b4e5be339b6eb4e3d78349c1.tar.bz2
Merge pull request #53 from dnlsng/fix-force_directory_mode
Fix name of 'force directory mode' option
-rw-r--r--manifests/server/share.pp8
-rw-r--r--spec/acceptance/basic_samba_spec.rb2
2 files changed, 5 insertions, 5 deletions
diff --git a/manifests/server/share.pp b/manifests/server/share.pp
index e5e23f1..7f8191c 100644
--- a/manifests/server/share.pp
+++ b/manifests/server/share.pp
@@ -8,7 +8,7 @@ define samba::server::share($ensure = present,
$create_mask = '',
$directory_mask = '',
$force_create_mask = '',
- $force_directory_mask = '',
+ $force_directory_mode = '',
$force_group = '',
$force_user = '',
$guest_ok = '',
@@ -81,9 +81,9 @@ define samba::server::share($ensure = present,
'' => "rm \"${target}/force create mask\"",
default => "set \"${target}/force create mask\" '${force_create_mask}'",
},
- $force_directory_mask ? {
- '' => "rm \"${target}/force directory mask\"",
- default => "set \"${target}/force directory mask\" '${force_directory_mask}'",
+ $force_directory_mode ? {
+ '' => "rm \"${target}/force directory mode\"",
+ default => "set \"${target}/force directory mode\" '${force_directory_mode}'",
},
$force_group ? {
'' => "rm \"${target}/force group\"",
diff --git a/spec/acceptance/basic_samba_spec.rb b/spec/acceptance/basic_samba_spec.rb
index 0dd6ac6..76e7f9f 100644
--- a/spec/acceptance/basic_samba_spec.rb
+++ b/spec/acceptance/basic_samba_spec.rb
@@ -18,7 +18,7 @@ describe 'basic samba' do
create_mask => 0777,
force_create_mask => 0777,
directory_mask => 0777,
- force_directory_mask => 0777,
+ force_directory_mode => 0777,
force_group => 'group',
force_user => 'user',
}