projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'waldi/rsync-systemd-master'
[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
04a0d7f
..
a2d5aee
100644
(file)
--- a/
modules/roles/manifests/security_mirror.pp
+++ b/
modules/roles/manifests/security_mirror.pp
@@
-1,4
+1,6
@@
class roles::security_mirror {
class roles::security_mirror {
+ include roles::archvsync_base
+
$rsync_bind = $::hostname ? {
mirror-anu => '150.203.164.61',
mirror-isc => '149.20.4.14',
$rsync_bind = $::hostname ? {
mirror-anu => '150.203.164.61',
mirror-isc => '149.20.4.14',
@@
-20,7
+22,14
@@
class roles::security_mirror {
default => undef,
}
default => undef,
}
- include apache2::cache
+ file { '/srv/mirrors/debian-security':
+ ensure => link,
+ target => '../ftp.root/debian-security',
+ }
+
+ include apache2::expires
+ include apache2::rewrite
+
apache2::site { '010-security.debian.org':
site => 'security.debian.org',
content => template('roles/security_mirror/security.debian.org.erb')
apache2::site { '010-security.debian.org':
site => 'security.debian.org',
content => template('roles/security_mirror/security.debian.org.erb')
@@
-51,7
+60,6
@@
class roles::security_mirror {
bind6 => $rsync_bind6,
}
bind6 => $rsync_bind6,
}
-
$onion_v4_addr = $::hostname ? {
mirror-anu => '150.203.164.61',
mirror-isc => '149.20.4.14',
$onion_v4_addr = $::hostname ? {
mirror-anu => '150.203.164.61',
mirror-isc => '149.20.4.14',