Skip to content

Commit

Permalink
Add some params:
Browse files Browse the repository at this point in the history 
server params :
- dns proxy
- log file
- max log size
- obey pam restrictions
- panic action
- passdb backend
- passwd chat
- passwd program
- server role
- syslog
- usershare allow guests
share params :
- hosts allow
- acl allow execute always

Add a test on ubuntu 16.04
  • Loading branch information
Alexis Autret committed Mar 15, 2017
1 parent 1020f7c commit 0c09413
Show file tree
Hide file tree
Showing 7 changed files with 152 additions and 56 deletions.
53 changes: 35 additions & 18 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Module for provisioning Samba

Supports:

* Ubuntu: 14.04, 12.04
* Ubuntu: 14.04, 12.04, 16.04 LTS
* Debian: 8.x, 7.x
* CentOS: 7.x, 6.x

Expand All @@ -29,26 +29,43 @@ Tweak and add the following to your site manifest:
```puppet
node 'server.example.com' {
class {'samba::server':
workgroup => 'example',
server_string => "Example Samba Server",
interfaces => "eth0 lo",
security => 'share'
workgroup => 'WORKGROUP',
server_string => "${::hostname}",
dns_proxy => 'no',
log_file => '/var/log/samba/log.%m',
max_log_size => '1000',
syslog => '0',
panic_action => '/usr/share/samba/panic-action %d',
server_role => 'standalone server',
passdb_backend => 'tdbsam',
obey_pam_restrictions => 'yes',
unix_password_sync => 'yes',
passwd_program => '/usr/bin/passwd %u',
passwd_chat => '*Enter\snew\s*\spassword:* %n\n *Retype\snew\s*\spassword:* %n\n *password\supdated\ssuccessfully* .',
pam_password_change => 'yes',
map_to_guest => 'Never',
usershare_allow_guests => 'yes',
#interfaces => "eth0 lo",
bind_interfaces_only => 'no',
security => 'user',
}
samba::server::share {'example-share':
comment => 'Example Share',
path => '/path/to/share',
guest_only => true,
guest_ok => true,
guest_account => "guest",
browsable => false,
create_mask => 0777,
force_create_mask => 0777,
directory_mask => 0777,
force_directory_mask => 0777,
force_group => 'group',
force_user => 'user',
copy => 'some-other-share',
comment => 'Example Share',
path => '/path/to/share',
guest_only => true,
guest_ok => true,
guest_account => "guest",
browsable => false,
create_mask => 0777,
force_create_mask => 0777,
directory_mask => 0777,
force_directory_mask => 0777,
force_group => 'group',
force_user => 'user',
copy => 'some-other-share',
hosts_allow => '127.0.0.1, 192.168.0.1'
acl_allow_execute_always => true,
}
}
```
Expand Down
94 changes: 58 additions & 36 deletions manifests/server.pp
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,38 @@
# == Class samba::server
#
class samba::server($interfaces = '',
$security = '',
$server_string = '',
$unix_password_sync = '',
$netbios_name = '',
$workgroup = '',
$socket_options = '',
class samba::server($bind_interfaces_only = 'yes',
$deadtime = '',
$keepalive = '',
$load_printers = '',
$printing = '',
$printcap_name = '',
$map_to_guest = 'Never',
$guest_account = '',
$disable_spoolss = '',
$dns_proxy = '',
$guest_account = '',
$keepalive = '',
$kernel_oplocks = '',
$pam_password_change = '',
$load_printers = '',
$log_file = '',
$map_to_guest = '',
$max_log_size = '',
$netbios_name = '',
$obey_pam_restrictions = '',
$os_level = '',
$pam_password_change = '',
$panic_action = '',
$passdb_backend = '',
$passwd_chat = '*Enter\snew\s*\spassword:* %n\n *Retype\snew\s*\spassword:* %n\n *password\supdated\ssuccessfully* .',
$passwd_program = '',
$preferred_master = '',
$bind_interfaces_only = 'yes',
$printcap_name = '',
$printing = '',
$security = '',
$server_role = '',
$server_string = '',
$shares = {},
$users = {}, ) {
$socket_options = '',
$syslog = '',
$unix_password_sync = '',
$usershare_allow_guests = '',
$users = {},
$workgroup = '',
$interfaces = '' ) {

include samba::server::install
include samba::server::config
Expand All @@ -41,26 +52,37 @@
}

samba::server::option {
'interfaces': value => $interfaces;
'bind interfaces only': value => $bind_interfaces_only;
'security': value => $security;
'server string': value => $server_string;
'unix password sync': value => $unix_password_sync;
'netbios name': value => $netbios_name;
'workgroup': value => $workgroup;
'socket options': value => $socket_options;
'deadtime': value => $deadtime;
'keepalive': value => $keepalive;
'load printers': value => $load_printers;
'printing': value => $printing;
'printcap name': value => $printcap_name;
'map to guest': value => $map_to_guest;
'guest account': value => $guest_account;
'disable spoolss': value => $disable_spoolss;
'kernel oplocks': value => $kernel_oplocks;
'pam password change': value => $pam_password_change;
'os level': value => $os_level;
'preferred master': value => $preferred_master;
'bind interfaces only': value => $bind_interfaces_only;
'deadtime': value => $deadtime;
'disable spoolss': value => $disable_spoolss;
'dns proxy': value => $dns_proxy;
'guest account': value => $guest_account;
'keepalive': value => $keepalive;
'kernel oplocks': value => $kernel_oplocks;
'load printers': value => $load_printers;
'log file': value => $log_file;
'map to guest': value => $map_to_guest;
'max log size': value => $max_log_size;
'netbios name': value => $netbios_name;
'obey pam restrictions': value => $obey_pam_restrictions;
'os level': value => $os_level;
'pam password change': value => $pam_password_change;
'panic action': value => $panic_action;
'passdb backend': value => $passdb_backend;
'passwd chat': value => $passwd_chat;
'passwd program': value => $passwd_program;
'preferred master': value => $preferred_master;
'printcap name': value => $printcap_name;
'printing': value => $printing;
'security': value => $security;
'server role': value => $server_role;
'server string': value => $server_string;
'socket options': value => $socket_options;
'syslog': value => $syslog;
'unix password sync': value => $unix_password_sync;
'usershare allow guests': value => $usershare_allow_guests;
'workgroup': value => $workgroup;
'interfaces': value => $interfaces;
}

create_resources(samba::server::share, $shares)
Expand Down
11 changes: 11 additions & 0 deletions manifests/server/share.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
$printer_name = '',
$msdfs_root = '',
$guest_account = '',
$hosts_allow = '',
$acl_allow_execute_always = '',
) {

$incl = $samba::server::incl
Expand Down Expand Up @@ -239,6 +241,15 @@
'' => "rm \"${target}/guest account\"",
default => "set \"${target}/guest account\" '${guest_account}'",
},
$hosts_allow ? {
'' => "rm \"${target}/hosts allow\"",
default => "set \"${target}/hosts allow\" '${hosts_allow}'",
},
$acl_allow_execute_always ? {
true => "set \"${target}/acl allow execute always\" yes",
false => "set \"${target}/acl allow execute always\" no",
default => "rm \"${target}/acl allow execute always\"",
},
]

augeas { "${name}-changes":
Expand Down
5 changes: 4 additions & 1 deletion spec/acceptance/basic_samba_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
let(:pp) {"
class { 'samba::server':
workgroup => 'example',
server_string => 'Example Samba Server'
server_string => 'Example Samba Server',
dns_proxy => 'no',
server_role => 'standalone server',
}
samba::server::share {'example-share':
Expand All @@ -23,6 +25,7 @@ class { 'samba::server':
force_user => 'user',
hide_dot_files => false,
msdfs_root => true,
hosts_allow => '127.0.0.1'
}
"}

Expand Down
12 changes: 12 additions & 0 deletions spec/acceptance/nodesets/uubuntu-server-1604-x64.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
HOSTS:
ubuntu-server-1604-x64:
roles:
- master
platform: ubuntu-1604-amd64
box: puppetlabs/ubuntu-16.04-64-nocm
box_url: https://vagrantcloud.com/puppetlabs/ubuntu-16.04-64-nocm
hypervisor: vagrant
CONFIG:
log_level: verbose
type: foss
color: false
11 changes: 11 additions & 0 deletions spec/classes/samba__server_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,17 @@
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('dns proxy') }
it { should contain_samba__server__option('log file') }
it { should contain_samba__server__option('max log size') }
it { should contain_samba__server__option('obey pam restrictions') }
it { should contain_samba__server__option('panic action') }
it { should contain_samba__server__option('passdb backend') }
it { should contain_samba__server__option('passwd chat') }
it { should contain_samba__server__option('passwd program') }
it { should contain_samba__server__option('server role') }
it { should contain_samba__server__option('syslog') }
it { should contain_samba__server__option('usershare allow guests') }

context 'with hiera shares hash' do
let(:params) {{
Expand Down
22 changes: 21 additions & 1 deletion spec/defines/samba__server__share_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
set.with("printer name")
set.with("msdfs root")
set.with("guest account")
set.with("hosts allow")
set.with("acl allow execute always")
end
let(:change_set) { default_changes }
let(:changes) { change_set.to_a }
Expand Down Expand Up @@ -75,7 +77,7 @@
{
"operatingsystem" => "Ubuntu",
"operatingsystemrelease" => [
"14.04"
"16.04"
]
},
{
Expand Down Expand Up @@ -682,6 +684,24 @@
}}
let(:change_set) { default_changes.with("guest account", "'someone'") }
end

context 'with hosts_allow set to "127.0.0.1"' do
include_examples "default share"
let(:params) {{
:ensure => 'present',
:hosts_allow => '127.0.0.1',
}}
let(:change_set) { default_changes.with("hosts allow", "127.0.0.1") }
end

context 'with acl_allow_execute_always to "true"' do
include_examples "default share"
let(:params) {{
:ensure => 'present',
:acl_allow_execute_always => true,
}}
let(:change_set) { default_changes.with("acl allow execute always", "true") }
end
end
end
end

0 comments on commit 0c09413

Please sign in to comment.