projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
now do lobos
[mirror/dsa-puppet.git]
/
modules
/
vsftpd
/
manifests
/
site.pp
diff --git
a/modules/vsftpd/manifests/site.pp
b/modules/vsftpd/manifests/site.pp
index
565dcdb
..
2087839
100644
(file)
--- a/
modules/vsftpd/manifests/site.pp
+++ b/
modules/vsftpd/manifests/site.pp
@@
-1,11
+1,10
@@
-
class
vsftpd::site (
+
define
vsftpd::site (
$source='',
$content='',
$source='',
$content='',
- $bind=
$::ipaddress
,
+ $bind=
''
,
$ensure=present
){
$ensure=present
){
- include vsftpd
include vsftpd::nolisten
if ($source and $content) {
include vsftpd::nolisten
if ($source and $content) {
@@
-19,14
+18,22
@@
class vsftpd::site (
$fname = "/etc/vsftpd-${name}.conf"
$fname = "/etc/vsftpd-${name}.conf"
+ $noop = $::hostname ? {
+ villa => false,
+ lobos => false,
+ default => true
+ }
+
if $source {
file { $fname:
ensure => $ensure,
if $source {
file { $fname:
ensure => $ensure,
+ noop => $noop,
source => $source,
}
} elsif $content {
file { $fname:
ensure => $ensure,
source => $source,
}
} elsif $content {
file { $fname:
ensure => $ensure,
+ noop => $noop,
content => $content,
}
} else {
content => $content,
}
} else {
@@
-36,7
+43,7
@@
class vsftpd::site (
# We don't need a firewall rule because it's added in vsftp.pp
xinetd::service { "vsftpd-${name}":
bind => $bind,
# We don't need a firewall rule because it's added in vsftp.pp
xinetd::service { "vsftpd-${name}":
bind => $bind,
- id =>
$name
,
+ id =>
"${name}-ftp"
,
server => '/usr/sbin/vsftpd',
port => 'ftp',
server_args => $fname,
server => '/usr/sbin/vsftpd',
port => 'ftp',
server_args => $fname,