projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update for new idiom
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
backports_master.pp
diff --git
a/modules/roles/manifests/backports_master.pp
b/modules/roles/manifests/backports_master.pp
index
507d0ff
..
44c5d44
100644
(file)
--- a/
modules/roles/manifests/backports_master.pp
+++ b/
modules/roles/manifests/backports_master.pp
@@
-2,24
+2,11
@@
class roles::backports_master {
include roles::backports_mirror
include roles::backports_mirror
- $bind = $::hostname ? {
- default => '',
- }
-
- $bind6 = $::hostname ? {
- default => '',
- }
-
vsftpd::site { 'backports':
vsftpd::site { 'backports':
- source => 'puppet:///modules/roles/backports_master/vsftpd.conf',
- bind => $bind,
+ banner => 'backports-master.debian.org FTP server',
+ logfile => '/var/log/ftp/vsftpd-backports-master.debian.org.log',
+ writable => true,
+ chown_user => dak,
+ root => '/srv/backports-upload',
}
}
-
- if $bind6 {
- vsftpd::site { 'security-v6':
- source => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
- bind => $bind6,
- }
- }
-
}
}