Skip to content

upd: added parameter whether to manage or not the samba service (class s... #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

upd: added parameter whether to manage or not the samba service (class s... #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions manifests/server.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,18 @@
$printing = '',
$printcap_name = '',
$disable_spoolss = '',
$bind_interfaces_only = 'yes',) {
$bind_interfaces_only = 'yes',
$manage_service = true,) {

include samba::server::install
include samba::server::config
include samba::server::service

# in case this is a service on a clustered node which is managed by - for
# example - pacemaker you can set this to <false>
if str2bool($manage_service) {
include samba::server::service
$notify_service = Class['samba::server::service']
}

$incl = '/etc/samba/smb.conf'
$context = "/files/etc/samba/smb.conf"
Expand All @@ -26,7 +33,7 @@
context => $context,
changes => "set ${target} global",
require => Class['samba::server::config'],
notify => Class['samba::server::service']
notify => $notify_service,
}

samba::server::option {
Expand Down
2 changes: 1 addition & 1 deletion manifests/server/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
group => 'root',
mode => '0644',
require => [File['/etc/samba'], Class['samba::server::install']],
notify => Class['samba::server::service']
notify => $::samba::server::notify_service,
}

}
8 changes: 4 additions & 4 deletions manifests/server/option.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
$target = $samba::server::target

$changes = $value ? {
default => "set \"${target}/$name\" \"$value\"",
'' => "rm ${target}/$name",
default => "set \"${target}/${name}\" \"${value}\"",
'' => "rm ${target}/${name}",
}

augeas { "samba-$name":
augeas { "samba-${name}":
incl => $incl,
lens => 'Samba.lns',
context => $context,
changes => $changes,
require => Augeas['global-section'],
notify => Class['Samba::Server::Service']
notify => $::samba::server::notify_service,
}
}
14 changes: 7 additions & 7 deletions manifests/server/share.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
default => "rm ${target} '${name}'",
},
require => Class['samba::server::config'],
notify => Class['samba::server::service']
notify => $::samba::server::notify_service,
}

if $ensure == 'present' {
Expand Down Expand Up @@ -130,7 +130,7 @@
context => $context,
changes => $changes,
require => Augeas["${name}-section"],
notify => Class['samba::server::service']
notify => $notify_service,
}

augeas { "${name}-valid_users":
Expand All @@ -140,7 +140,7 @@
'' => "rm \"${target}/valid users\"",
},
require => Augeas["${name}-section"],
notify => Class['samba::server::service']
notify => $notify_service
}

augeas { "${name}-op_locks":
Expand All @@ -150,7 +150,7 @@
'' => "rm \"${target}/oplocks\"",
},
require => Augeas["${name}-section"],
notify => Class['samba::server::service']
notify => $notify_service,
}
augeas { "${name}-level2_oplocks":
context => $context,
Expand All @@ -159,7 +159,7 @@
'' => "rm \"${target}/level2 oplocks\"",
},
require => Augeas["${name}-section"],
notify => Class['samba::server::service']
notify => $notify_service,
}
augeas { "${name}-veto_oplock_files":
context => $context,
Expand All @@ -168,7 +168,7 @@
'' => "rm \"${target}/veto oplock files\"",
},
require => Augeas["${name}-section"],
notify => Class['samba::server::service']
notify => $notify_service,
}
augeas { "${name}-write_list":
context => $context,
Expand All @@ -177,7 +177,7 @@
'' => "rm \"${target}/write list\"",
},
require => Augeas["${name}-section"],
notify => Class['samba::server::service']
notify => $notify_service,
}

}
Expand Down
21 changes: 10 additions & 11 deletions manifests/server/user.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
define samba::server::user(
$user_name = $name ,
$password ,
) {
exec { "add smb account for ${user_name}":
command => "/sbin/add_samba_user '${user_name}' '${password}'" ,
unless => "/sbin/check_samba_user '${user_name}'" ,
require => [
User["${user_name}"]
] ,
notify => Class['samba::server::service']
}
$user_name = $name,
$password,
) {

exec { "add smb account for ${user_name}":
command => "/sbin/add_samba_user '${user_name}' '${password}'" ,
unless => "/sbin/check_samba_user '${user_name}'" ,
require => User[$user_name],
notify => $::samba::server::notify_service,
}
}