projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove kokkonen from mailout (our MX; RT#3977)
[mirror/dsa-puppet.git]
/
modules
/
rsync
/
manifests
/
site.pp
diff --git
a/modules/rsync/manifests/site.pp
b/modules/rsync/manifests/site.pp
index
6151e91
..
bb2ee14
100644
(file)
--- a/
modules/rsync/manifests/site.pp
+++ b/
modules/rsync/manifests/site.pp
@@
-2,13
+2,18
@@
define rsync::site (
$bind='',
$source='',
$content='',
$bind='',
$source='',
$content='',
- $fname=
"/etc/rsyncd-${name}.conf"
,
+ $fname=
''
,
$max_clients=200,
$ensure=present
){
include rsync
$max_clients=200,
$ensure=present
){
include rsync
+ if ! $fname {
+ $fname_real = "/etc/rsyncd-${name}.conf"
+ } else {
+ $fname_real = $fname
+ }
case $ensure {
present,absent: {}
default: { fail ( "Invald ensure `${ensure}' for ${name}" ) }
case $ensure {
present,absent: {}
default: { fail ( "Invald ensure `${ensure}' for ${name}" ) }
@@
-19,15
+24,13
@@
define rsync::site (
}
if $source {
}
if $source {
- file { $fname:
+ file { $fname
_real
:
ensure => $ensure,
ensure => $ensure,
- noop => true,
source => $source
}
} elsif $content {
source => $source
}
} elsif $content {
- file { $fname:
+ file { $fname
_real
:
ensure => $ensure,
ensure => $ensure,
- noop => true,
content => $content,
}
} else {
content => $content,
}
} else {
@@
-35,15
+38,14
@@
define rsync::site (
}
xinetd::service { "rsync-${name}":
}
xinetd::service { "rsync-${name}":
- noop => true,
bind => $bind,
id => "${name}-rsync",
bind => $bind,
id => "${name}-rsync",
- server => '/usr/
sbin/rsyncd
',
+ server => '/usr/
bin/rsync
',
port => 'rsync',
port => 'rsync',
- server_args =>
$fname
,
+ server_args =>
"--daemon --config=${fname_real}"
,
ferm => false,
instances => $max_clients,
ferm => false,
instances => $max_clients,
- require => File[$fname]
+ require => File[$fname
_real
]
}
Service['rsync']->Service['xinetd']
}
Service['rsync']->Service['xinetd']