class roles::syncproxy {
+ include roles::archvsync_base
+
$bind = $::hostname ? {
'milanollo' => '5.153.231.9',
'mirror-anu' => '150.203.164.60',
- 'mirror-isc' => '149.20.20.21',
+ 'mirror-isc' => '149.20.4.16',
'mirror-umn' => '128.101.240.216',
'klecker' => '130.89.148.10',
+ 'gretchaninov' => '209.87.16.40',
default => ''
}
$bind6 = $::hostname ? {
'milanollo' => '2001:41c8:1000:21::21:9',
'mirror-anu' => '2001:388:1034:2900::3c',
- 'mirror-isc' => '2001:4f8:8:36::1deb:21',
+ 'mirror-isc' => '2001:4f8:1:c::16',
'mirror-umn' => '2607:ea00:101:3c0b::1deb:216',
'klecker' => '2001:610:1908:b000::148:10',
+ 'gretchaninov' => '2607:f8f0:614:1::1274:40',
default => ''
}
$syncproxy_name = $::hostname ? {
'mirror-isc' => 'syncproxy2.wna.debian.org',
'mirror-umn' => 'syncproxy.cna.debian.org',
'klecker' => 'syncproxy2.eu.debian.org',
+ 'gretchaninov' => 'syncproxy3.wna.debian.org',
default => 'unknown'
}
- rsync::site { 'syncproxy':
- content => template('roles/syncproxy/rsyncd.conf.erb'),
- bind => $bind,
- bind6 => $bind6,
- }
-
file { '/etc/rsyncd':
ensure => 'directory'
}
if $::apache2 and $syncproxy_name != 'unknown' {
include apache2::ssl
- ssl::service { "$syncproxy_name": notify => Service['apache2'], key => true, }
+ ssl::service { "$syncproxy_name":
+ notify => Exec['service apache2 reload'],
+ key => true,
+ }
apache2::site { '010-syncproxy.debian.org':
site => 'syncproxy.debian.org',
content => template('roles/syncproxy/syncproxy.debian.org-apache.erb')
content => template('roles/syncproxy/syncproxy.debian.org-index.html.erb')
}
- file { '/etc/rsyncd-syncproxy-stunnel.conf':
- content => template('roles/syncproxy/rsyncd-syncproxy-stunnel.conf.erb')
+ rsync::site { 'syncproxy':
+ content => template('roles/syncproxy/rsyncd.conf.erb'),
+ bind => $bind,
+ bind6 => $bind6,
+ sslname => "$syncproxy_name",
}
- xinetd::service { "rsync-syncproxy-ssl":
- bind => $bind,
- id => "syncproxy-rsync-ssl",
- server => '/usr/bin/stunnel4',
- service => 'rsync-ssl',
- type => 'UNLISTED',
- port => '1873',
- server_args => "/etc/rsyncd-syncproxy-stunnel.conf",
- ferm => false,
- instances => 50,
- require => File[/etc/rsyncd-syncproxy-stunnel.conf],
- }
-
- if $bind6 != '' {
- xinetd::service { "rsync-syncproxy-ssl6":
- bind => $bind6,
- id => "syncproxy-rsync-ssl",
- server => '/usr/bin/stunnel4',
- service => 'rsync-ssl',
- type => 'UNLISTED',
- port => '1873',
- server_args => "/etc/rsyncd-syncproxy-stunnel.conf",
- ferm => false,
- instances => 50,
- require => File[/etc/rsyncd-syncproxy-stunnel.conf],
- }
- }
-
- @ferm::rule { "dsa-rsync-ssl":
- description => "Allow traffic to rsync ssl",
- rule => "&SERVICE(${protocol}, 1873)"
+ } else {
+ rsync::site { 'syncproxy':
+ content => template('roles/syncproxy/rsyncd.conf.erb'),
+ bind => $bind,
+ bind6 => $bind6,
}
}
}