-class vsftpd::site (
+define vsftpd::site (
$source='',
$content='',
- $bind=$::ipaddress,
+ $bind='',
$ensure=present
){
- include vsftpd
include vsftpd::nolisten
if ($source and $content) {
$fname = "/etc/vsftpd-${name}.conf"
+ $noop = $::hostname ? {
+ villa => false,
+ lobos => false,
+ default => true
+ }
+
if $source {
file { $fname:
ensure => $ensure,
- noop => true,
+ noop => $noop,
source => $source,
}
} elsif $content {
file { $fname:
ensure => $ensure,
- noop => true,
+ noop => $noop,
content => $content,
}
} else {
# 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,