projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Attempt to configure an apache vhost for a static component only if it exists on...
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
static_mirror.pp
diff --git
a/modules/roles/manifests/static_mirror.pp
b/modules/roles/manifests/static_mirror.pp
index
26ffa34
..
32de1c1
100644
(file)
--- a/
modules/roles/manifests/static_mirror.pp
+++ b/
modules/roles/manifests/static_mirror.pp
@@
-15,6
+15,11
@@
class roles::static_mirror {
mode => '0555',
}
mode => '0555',
}
+ file { '/usr/local/bin/static-mirror-run-all':
+ source => 'puppet:///modules/roles/static-mirroring/static-mirror-run-all',
+ mode => '0555',
+ }
+
file { '/srv/static.debian.org':
ensure => directory,
owner => staticsync,
file { '/srv/static.debian.org':
ensure => directory,
owner => staticsync,
@@
-23,16
+28,18
@@
class roles::static_mirror {
}
file { '/etc/cron.d/puppet-static-mirror':
}
file { '/etc/cron.d/puppet-static-mirror':
- content => "
PATH=/usr/local/bin:/usr/bin:/bin\n@reboot staticsync sleep 60; awk '!/^ *(#|$)/ {print \$1, \$2}' /etc/static-components.conf | while read master component; do static-mirror-run --one-stage /srv/static.debian.org/mirrors/\$component \"\$master:\$component/-live-\" > /dev/null; done
\n",
+ content => "
MAILTO=root\nPATH=/usr/local/bin:/usr/bin:/bin\n@reboot staticsync sleep 60; chronic static-mirror-run-all
\n",
}
$vhost_listen = $::hostname ? {
}
$vhost_listen = $::hostname ? {
- klecker => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80',
- default => '*:80',
+ klecker => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80',
+ mirror-isc => '149.20.20.20:80 [2001:4f8:8:36::1deb:20]:80',
+ default => '*:80',
}
$vhost_listen_443 = $::hostname ? {
}
$vhost_listen_443 = $::hostname ? {
- klecker => '130.89.148.14:443 [2001:610:1908:b000::148:14]:443',
- default => '*:443',
+ klecker => '130.89.148.14:443 [2001:610:1908:b000::148:14]:443',
+ mirror-isc => '149.20.20.20:443 [2001:4f8:8:36::1deb:20]:443',
+ default => '*:443',
}
apache2::config { 'local-static-vhost.conf':
}
apache2::config { 'local-static-vhost.conf':
@@
-66,7
+73,16
@@
class roles::static_mirror {
ssl::service { 'www.debian.org':
notify => Service['apache2'],
}
ssl::service { 'www.debian.org':
notify => Service['apache2'],
}
+ ssl::service { 'bits.debian.org':
+ notify => Service['apache2'],
+ }
+ ssl::service { 'lintian.debian.org':
+ notify => Service['apache2'],
+ }
ssl::service { 'rtc.debian.org':
notify => Service['apache2'],
}
ssl::service { 'rtc.debian.org':
notify => Service['apache2'],
}
+ ssl::service { 'appstream.debian.org':
+ notify => Service['apache2'],
+ }
}
}