projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New ipv6 addresses for klecker
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
ftp.pp
diff --git
a/modules/roles/manifests/ftp.pp
b/modules/roles/manifests/ftp.pp
index
fa6421e
..
cede542
100644
(file)
--- a/
modules/roles/manifests/ftp.pp
+++ b/
modules/roles/manifests/ftp.pp
@@
-1,30
+1,16
@@
class roles::ftp {
class roles::ftp {
+ # this is the FTP part of the roles::debian_mirror class
- $bind = $::hostname ? {
- klecker => '::ffff:130.89.148.12',
- default => '',
- }
-
- $bind6 = $::hostname ? {
- klecker => '2001:610:1908:b000::148:12',
- default => '',
+ $binds = $::hostname ? {
+ klecker => [ '130.89.148.12', '[2001:610:1908:b000::148:12]', '[2001:67c:2564:a119::148:12]' ],
+ default => [ '[::]' ],
}
vsftpd::site { 'ftp':
banner => 'ftp.debian.org FTP server',
logfile => '/var/log/ftp/vsftpd-ftp.debian.org.log',
}
vsftpd::site { 'ftp':
banner => 'ftp.debian.org FTP server',
logfile => '/var/log/ftp/vsftpd-ftp.debian.org.log',
- bind
=> $bind
,
+ bind
s => $binds
,
max_clients => 200,
root => '/srv/ftp.debian.org/ftp.root',
}
max_clients => 200,
root => '/srv/ftp.debian.org/ftp.root',
}
-
- if $bind6 {
- vsftpd::site { 'ftp-v6':
- banner => 'ftp.debian.org FTP server',
- logfile => '/var/log/ftp/vsftpd-ftp.debian.org.log',
- bind => $bind6,
- max_clients => 200,
- root => '/srv/ftp.debian.org/ftp.root',
- }
- }
}
}