aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jahn <ajjahn@gmail.com>2015-10-09 13:31:38 -0400
committerAdam Jahn <ajjahn@gmail.com>2015-10-09 13:31:38 -0400
commit041e4a74de3dca2462be512cec620804a6eefe09 (patch)
treeb4099675d98ef691cfc15d175817b2fbe3527f33
parent4883474e6b6c96258f4f484326aa81716a65aa54 (diff)
parent47c02047d9924bf2a62d8f099e28e6366b60b5fb (diff)
downloadpuppet-samba-041e4a74de3dca2462be512cec620804a6eefe09.tar.gz
puppet-samba-041e4a74de3dca2462be512cec620804a6eefe09.tar.bz2
Merge pull request #46 from davidsheldon/patch-1
Fix "load printers" setting name
-rw-r--r--manifests/server.pp8
-rw-r--r--spec/classes/samba__server_spec.rb8
2 files changed, 8 insertions, 8 deletions
diff --git a/manifests/server.pp b/manifests/server.pp
index 4120154..a73ad99 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -45,14 +45,14 @@ class samba::server($interfaces = '',
'unix password sync': value => $unix_password_sync;
'netbios name': value => $netbios_name;
'workgroup': value => $workgroup;
- 'socket_options': value => $socket_options;
+ 'socket options': value => $socket_options;
'deadtime': value => $deadtime;
'keepalive': value => $keepalive;
- 'load_printers': value => $load_printers;
+ 'load printers': value => $load_printers;
'printing': value => $printing;
- 'printcap_name': value => $printcap_name;
+ 'printcap name': value => $printcap_name;
'map to guest': value => $map_to_guest;
- 'disable_spoolss': value => $disable_spoolss;
+ 'disable spoolss': value => $disable_spoolss;
'kernel oplocks': value => $kernel_oplocks;
'pam password change': value => $pam_password_change;
'os level': value => $os_level;
diff --git a/spec/classes/samba__server_spec.rb b/spec/classes/samba__server_spec.rb
index fce10bb..69fa0ec 100644
--- a/spec/classes/samba__server_spec.rb
+++ b/spec/classes/samba__server_spec.rb
@@ -13,13 +13,13 @@ describe 'samba::server' do
it { should contain_samba__server__option('server string') }
it { should contain_samba__server__option('unix password sync') }
it { should contain_samba__server__option('workgroup') }
- it { should contain_samba__server__option('socket_options') }
+ it { should contain_samba__server__option('socket options') }
it { should contain_samba__server__option('deadtime') }
it { should contain_samba__server__option('keepalive') }
- it { should contain_samba__server__option('load_printers') }
+ it { should contain_samba__server__option('load printers') }
it { should contain_samba__server__option('printing') }
- it { should contain_samba__server__option('printcap_name') }
- it { should contain_samba__server__option('disable_spoolss') }
+ it { should contain_samba__server__option('printcap name') }
+ it { should contain_samba__server__option('disable spoolss') }
it { should contain_file('/sbin/check_samba_user').with_owner('root') }
it { should contain_file('/sbin/add_samba_user').with_owner('root') }