From b2d5840ca565eb79672b152bcd74a24127929808 Mon Sep 17 00:00:00 2001 From: David Sheldon Date: Fri, 9 Oct 2015 17:31:30 +0100 Subject: Fix "load printers" setting name Samba doesn't seem to understand "load_printers", it's "load printers" instead. Ignoring unknown parameter "load_printers" --- manifests/server.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/server.pp b/manifests/server.pp index 4120154..b4e9955 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -48,7 +48,7 @@ class samba::server($interfaces = '', '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; 'map to guest': value => $map_to_guest; -- cgit v1.2.3 From 590d55da8dc735a9f955f6c9df7a424dd8609033 Mon Sep 17 00:00:00 2001 From: David Sheldon Date: Fri, 9 Oct 2015 18:24:22 +0100 Subject: Fix tests for all the _ options. --- spec/classes/samba__server_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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') } -- cgit v1.2.3 From 47c02047d9924bf2a62d8f099e28e6366b60b5fb Mon Sep 17 00:00:00 2001 From: David Sheldon Date: Fri, 9 Oct 2015 18:25:29 +0100 Subject: Fix the rest of the options with _ in Having read man smb.conf, none of these options should have _ in the resulting option name. --- manifests/server.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/server.pp b/manifests/server.pp index b4e9955..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; '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; -- cgit v1.2.3