aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jahn <ajjahn@gmail.com>2016-03-14 15:21:46 -0400
committerAdam Jahn <ajjahn@gmail.com>2016-03-14 15:21:46 -0400
commiteb97a2b642499fde7afdb64dfd3e2b7e8c14eacc (patch)
treedc31d7e0e39b48f75475f374d5301bba10c7c64a
parent4c1f7bcca1293ebd0377a0e5d5df310a6f6d4b13 (diff)
parentca2e283c1fdc916f5d7f9fb99244bc9d53c766b6 (diff)
downloadpuppet-samba-eb97a2b642499fde7afdb64dfd3e2b7e8c14eacc.tar.gz
puppet-samba-eb97a2b642499fde7afdb64dfd3e2b7e8c14eacc.tar.bz2
Merge pull request #55 from HielkeJ/master
Add option hide dot files to share.
-rwxr-xr-x[-rw-r--r--]Gemfile2
-rwxr-xr-x[-rw-r--r--]manifests/server/share.pp6
-rw-r--r--spec/acceptance/basic_samba_spec.rb1
3 files changed, 8 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 27d092a..a89c9e6 100644..100755
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ group :development do
end
group :test do
- gem "rake"
+ gem "rake", '< 11.0'
gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.7.0'
gem "puppet-lint", :github => 'rodjek/puppet-lint',
:ref => '2546fed6be894bbcff15c3f48d4b6f6bc15d94d1'
diff --git a/manifests/server/share.pp b/manifests/server/share.pp
index 7f8191c..b0690bb 100644..100755
--- a/manifests/server/share.pp
+++ b/manifests/server/share.pp
@@ -29,6 +29,7 @@ define samba::server::share($ensure = present,
$map_acl_inherit = '',
$store_dos_attributes = '',
$strict_allocate = '',
+ $hide_dot_files = '',
) {
$incl = $samba::server::incl
@@ -177,6 +178,11 @@ define samba::server::share($ensure = present,
'' => "rm \"${target}/write list\"",
default => "set \"${target}/write list\" '${write_list}'",
},
+ $hide_dot_files ? {
+ true => "set \"${target}/hide dot files\" yes",
+ false => "set \"${target}/hide dot files\" no",
+ default => "rm \"${target}/hide dot files\"",
+ },
]
augeas { "${name}-changes":
diff --git a/spec/acceptance/basic_samba_spec.rb b/spec/acceptance/basic_samba_spec.rb
index 76e7f9f..8a9e363 100644
--- a/spec/acceptance/basic_samba_spec.rb
+++ b/spec/acceptance/basic_samba_spec.rb
@@ -21,6 +21,7 @@ describe 'basic samba' do
force_directory_mode => 0777,
force_group => 'group',
force_user => 'user',
+ hide_dot_files => false,
}
"}