projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make a hiera setting for mirror base directory (/srv/mirrors)
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
debian_mirror.pp
diff --git
a/modules/roles/manifests/debian_mirror.pp
b/modules/roles/manifests/debian_mirror.pp
index
6273a57
..
1eae310
100644
(file)
--- a/
modules/roles/manifests/debian_mirror.pp
+++ b/
modules/roles/manifests/debian_mirror.pp
@@
-1,9
+1,13
@@
class roles::debian_mirror {
include roles::archvsync_base
class roles::debian_mirror {
include roles::archvsync_base
+ $mirror_basedir_prefix = hiera('role_config__mirrors.mirror_basedir_prefix')
+ $archive_root = "${mirror_basedir_prefix}debian"
+
$vhost_listen = join([
$::hostname ? {
$vhost_listen = join([
$::hostname ? {
- klecker => '130.89.148.12:80 [2001:610:1908:b000::148:12]:80',
+ klecker => '130.89.148.12:80 [2001:610:1908:b000::148:12]:80 [2001:67c:2564:a119::148:12]:80',
+ mirror-bytemark => '5.153.231.45:80 [2001:41c8:1000:21::21:45]:80',
mirror-isc => '149.20.4.15:80 [2001:4f8:1:c::15]:80',
mirror-conova => '217.196.149.232:80 [2a02:16a8:dc41:100::232]:80',
default => '*:80',
mirror-isc => '149.20.4.15:80 [2001:4f8:1:c::15]:80',
mirror-conova => '217.196.149.232:80 [2a02:16a8:dc41:100::232]:80',
default => '*:80',
@@
-13,14
+17,11
@@
class roles::debian_mirror {
default => '',
}], ' ')
$onion_v4_addr = $::hostname ? {
default => '',
}], ' ')
$onion_v4_addr = $::hostname ? {
- mirror-bytemark => '5.153.231.
37
',
+ mirror-bytemark => '5.153.231.
45
',
klecker => '130.89.148.12',
mirror-isc => '149.20.4.15',
default => undef,
}
klecker => '130.89.148.12',
mirror-isc => '149.20.4.15',
default => undef,
}
- $archive_root = $::hostname ? {
- default => '/srv/mirrors/debian',
- }
apache2::site { '010-ftp.debian.org':
site => 'ftp.debian.org',
apache2::site { '010-ftp.debian.org':
site => 'ftp.debian.org',