diff options
| author | Daniel Sung <daniel.sung@me.com> | 2016-02-15 15:50:43 +0000 |
|---|---|---|
| committer | Daniel Sung <daniel.sung@me.com> | 2016-02-15 15:50:43 +0000 |
| commit | 2e78387a530b2c987bf3c26712f30a641abd2081 (patch) | |
| tree | e5596b1c4f71061d8bb8d1d6fae2fd934d2ce0a9 | |
| parent | 430054887e7894690524bcd7d4a629280f18479f (diff) | |
| download | puppet-samba-2e78387a530b2c987bf3c26712f30a641abd2081.tar.gz puppet-samba-2e78387a530b2c987bf3c26712f30a641abd2081.tar.bz2 | |
Fix name of 'force directory mode' option
Previously the class was setting a value for 'force directory mask' which
was getting ignored by samba. Running testparm -v would give:
Unknown parameter encountered: "force directory mask"
Ignoring unknown parameter "force directory mask"
The correct option name is 'force directory mode' according to the man
page.
| -rw-r--r-- | manifests/server/share.pp | 8 | ||||
| -rw-r--r-- | spec/acceptance/basic_samba_spec.rb | 2 |
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', } |