include roles::archvsync_base
include apache2::expires
- $rsync_bind = $::hostname ? {
- gretchaninov => '209.87.16.41',
- klecker => '130.89.148.13',
- mirror-conova => '217.196.149.234',
- sibelius => '193.62.202.28',
- default => '',
- }
- $rsync_bind6 = $::hostname ? {
- gretchaninov => '2607:f8f0:614:1::1274:41',
- klecker => '2001:610:1908:b000::148:13',
- mirror-conova => '2a02:16a8:dc41:100::234',
- sibelius => '2001:630:206:4000:1a1a:0:c13e:ca1c',
- default => '',
- }
+ $mirror_basedir_prefix = hiera('role_config__mirrors.mirror_basedir_prefix')
+ $archive_root = "${mirror_basedir_prefix}debian-archive"
- $vhost_listen = join([
- ($rsync_bind == '') ? { true => "*:80", default => "$rsync_bind:80" },
- ($rsync6_bind == '') ? { true => "*:80", default => "[$rsync6_bind]:80" }
- ], ' ')
+ $binds = $::hostname ? {
+ gretchaninov => ['209.87.16.41' , '[2607:f8f0:614:1::1274:41]' ],
+ klecker => ['130.89.148.13' , '[2001:67c:2564:a119::148:13]' ],
+ mirror-conova => ['217.196.149.234', '[2a02:16a8:dc41:100::234]' ],
+ sibelius => ['193.62.202.28' , '[2001:630:206:4000:1a1a:0:c13e:ca1c]'],
+ default => ['[::]'],
}
$onion_v4_addr = $::hostname ? {
default => undef,
}
- $archive_root = $::hostname ? {
- default => '/srv/mirrors/debian-archive',
- }
apache2::site { '010-archive.debian.org':
site => 'archive.debian.org',
tlsaport => [],
}
} else {
- $sslname = ''
+ $sslname = undef
}
- rsync::site_systemd { 'archive':
- source => 'puppet:///modules/roles/historical_mirror/rsyncd.conf',
+ rsync::site { 'archive':
+ content => template('roles/historical_mirror/rsyncd.conf.erb'),
max_clients => 100,
sslname => $sslname,
- bind => $rsync_bind,
- bind6 => $rsync_bind6,
+ binds => $binds,
}
if has_role('historical_mirror_onion') {