projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
roll out to wieck
[mirror/dsa-puppet.git]
/
modules
/
vsftpd
/
manifests
/
nolisten.pp
diff --git
a/modules/vsftpd/manifests/nolisten.pp
b/modules/vsftpd/manifests/nolisten.pp
index
38e6d8c
..
3068a51
100644
(file)
--- a/
modules/vsftpd/manifests/nolisten.pp
+++ b/
modules/vsftpd/manifests/nolisten.pp
@@
-1,11
+1,23
@@
-class vsftpd::nolisten {
+class vsftpd::nolisten inherits vsftpd {
+
+ $noop = $::hostname ? {
+ villa => false,
+ lobos => false,
+ steffani => false,
+ wieck => false,
+ default => true
+ }
Service['vsftpd'] {
Service['vsftpd'] {
- ensure => stopped
+ ensure => stopped,
+ noop => $noop,
}
}
+ Service['vsftpd']->Service['xinetd']
+
file { '/etc/vsftpd.conf':
file { '/etc/vsftpd.conf':
- content => 'listen=NO'
+ noop => $noop,
+ content => "listen=NO\n",
notify => Service['vsftpd']
}
}
notify => Service['vsftpd']
}
}