projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop xinetd support in rsync
[mirror/dsa-puppet.git]
/
modules
/
vsftpd
/
manifests
/
site.pp
diff --git
a/modules/vsftpd/manifests/site.pp
b/modules/vsftpd/manifests/site.pp
index
338a592
..
98cca97
100644
(file)
--- a/
modules/vsftpd/manifests/site.pp
+++ b/
modules/vsftpd/manifests/site.pp
@@
-3,19
+3,22
@@
define vsftpd::site (
$bind='',
$chown_user='',
$writable=false,
$bind='',
$chown_user='',
$writable=false,
+ $writable_other=false,
$banner="${name} FTP Server",
$max_clients=100,
$logfile="/var/log/ftp/vsftpd-${name}.debian.org.log",
$ensure=present
){
$banner="${name} FTP Server",
$max_clients=100,
$logfile="/var/log/ftp/vsftpd-${name}.debian.org.log",
$ensure=present
){
- include vsftpd
::nolisten
+ include vsftpd
case $ensure {
present,absent: {}
default: { fail ( "Invald ensure `$ensure' for $name" ) }
}
case $ensure {
present,absent: {}
default: { fail ( "Invald ensure `$ensure' for $name" ) }
}
+ $ftpsite = $name
+
$fname = "/etc/vsftpd-${name}.conf"
file { $fname:
$fname = "/etc/vsftpd-${name}.conf"
file { $fname:
@@
-24,20
+27,30
@@
define vsftpd::site (
}
file { "/etc/logrotate.d/vsftpd-${name}":
}
file { "/etc/logrotate.d/vsftpd-${name}":
+ ensure => absent
+ }
+
+ munin::check { "vsftpd-${name}":
+ ensure => $ensure,
+ script => 'vsftpd'
+ }
+ munin::conf { "vsftpd-${name}":
ensure => $ensure,
ensure => $ensure,
- content => template('vsftpd/
logrotate
.erb')
+ content => template('vsftpd/
munin
.erb')
}
# We don't need a firewall rule because it's added in vsftp.pp
xinetd::service { "vsftpd-${name}":
}
# We don't need a firewall rule because it's added in vsftp.pp
xinetd::service { "vsftpd-${name}":
+ ensure => $ensure,
bind => $bind,
id => "${name}-ftp",
server => '/usr/sbin/vsftpd',
bind => $bind,
id => "${name}-ftp",
server => '/usr/sbin/vsftpd',
-
port
=> 'ftp',
+
service
=> 'ftp',
server_args => $fname,
ferm => false,
instances => $max_clients,
require => File[$fname]
}
server_args => $fname,
ferm => false,
instances => $max_clients,
require => File[$fname]
}
+ Service['vsftpd']->Service['xinetd']
}
}