projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
default to exim
[mirror/dsa-puppet.git]
/
modules
/
vsftpd
/
manifests
/
site.pp
diff --git
a/modules/vsftpd/manifests/site.pp
b/modules/vsftpd/manifests/site.pp
index
f653875
..
fc941f3
100644
(file)
--- a/
modules/vsftpd/manifests/site.pp
+++ b/
modules/vsftpd/manifests/site.pp
@@
-9,7
+9,7
@@
define vsftpd::site (
$ensure=present
){
$ensure=present
){
- include vsftpd
::nolisten
+ include vsftpd
case $ensure {
present,absent: {}
case $ensure {
present,absent: {}
@@
-20,7
+20,6
@@
define vsftpd::site (
file { $fname:
ensure => $ensure,
file { $fname:
ensure => $ensure,
- noop => true,
content => template('vsftpd/vsftpd.conf.erb')
}
content => template('vsftpd/vsftpd.conf.erb')
}
@@
-41,4
+40,5
@@
define vsftpd::site (
require => File[$fname]
}
require => File[$fname]
}
+ Service['vsftpd']->Service['xinetd']
}
}