projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add /debian-ports-cd alias to ftp.ports.debian.org
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
security_mirror.pp
diff --git
a/modules/roles/manifests/security_mirror.pp
b/modules/roles/manifests/security_mirror.pp
index
5e3ee78
..
7ae7500
100644
(file)
--- a/
modules/roles/manifests/security_mirror.pp
+++ b/
modules/roles/manifests/security_mirror.pp
@@
-1,30
+1,35
@@
class roles::security_mirror {
class roles::security_mirror {
-
- apache2::site { '010-security.debian.org':
- site => 'security.debian.org',
- config => 'puppet:///modules/roles/security_mirror/security.debian.org'
+ $rsync_bind = $::hostname ? {
+ mirror-anu => '150.203.164.61',
+ mirror-isc => '149.20.20.19',
+ mirror-umn => '128.101.240.215',
+ default => '',
}
}
-
- $bind = $::hostname ? {
- default => '',
+ $rsync_bind6 = $::hostname ? {
+ mirror-anu => '2001:388:1034:2900::3d',
+ mirror-isc => '2001:4f8:8:36::1deb:19',
+ mirror-umn => '2607:ea00:101:3c0b::1deb:215',
+ default => '',
}
}
- $bind6 = $::hostname ? {
- default => '',
+ include apache2::cache
+ apache2::site { '010-security.debian.org':
+ site => 'security.debian.org',
+ content => template('roles/security_mirror/security.debian.org.erb')
}
}
+ include ferm::ftp_conntrack
vsftpd::site { 'security':
vsftpd::site { 'security':
- source => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
- logfile => '/var/log/ftp/vsftpd-security.debian.org.log',
- bind => $bind,
+ banner => 'security.debian.org FTP server (vsftpd)',
+ logfile => '/var/log/ftp/vsftpd-security.debian.org.log',
+ max_clients => 200,
+ root => '/srv/ftp.root/',
}
}
- if $bind6 {
- vsftpd::site { 'security-v6':
- source => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
- logfile => '/var/log/ftp/vsftpd-security.debian.org.log',
- bind => $bind6,
- }
+ rsync::site { 'security':
+ source => 'puppet:///modules/roles/security_mirror/rsyncd.conf',
+ max_clients => 100,
+ bind => $rsync_bind,
+ bind6 => $rsync_bind6,
}
}
-
}
}