projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename rsync::site_systemd to rsync::site
[mirror/dsa-puppet.git]
/
modules
/
vsftpd
/
manifests
/
site_systemd.pp
diff --git
a/modules/vsftpd/manifests/site_systemd.pp
b/modules/vsftpd/manifests/site_systemd.pp
index
4825897
..
27a75be
100644
(file)
--- a/
modules/vsftpd/manifests/site_systemd.pp
+++ b/
modules/vsftpd/manifests/site_systemd.pp
@@
-27,6
+27,8
@@
define vsftpd::site_systemd (
absent => false,
}
absent => false,
}
+ $ftpsite = $name
+
$fname = "/etc/vsftpd-${name}.conf"
file { $fname:
$fname = "/etc/vsftpd-${name}.conf"
file { $fname:
@@
-74,15
+76,6
@@
define vsftpd::site_systemd (
provider => systemd,
}
provider => systemd,
}
- xinetd::service { [ "vsftpd-${name}", "vsftpd-${name}6", "vsftpd-${name}-v6" ]:
- ensure => absent,
- id => 'unused',
- server => 'unused',
- service => 'unused',
- ferm => false,
- before => Service["vsftpd-${name}.socket"],
- }
-
munin::check { "vsftpd-${name}":
ensure => $ensure,
script => 'vsftpd'
munin::check { "vsftpd-${name}":
ensure => $ensure,
script => 'vsftpd'