projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
busoni bugs cleanup
[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
c98464c
..
240a6bf
100644
(file)
--- a/
modules/roles/manifests/static_mirror.pp
+++ b/
modules/roles/manifests/static_mirror.pp
@@
-2,13
+2,14
@@
class roles::static_mirror {
include roles::static_source
include roles::static_source
- package { 'libapache2-mod-macro':
- ensure => installed,
- }
+ package { 'libapache2-mod-macro':
ensure => installed, }
+ package { 'libapache2-mod-geoip': ensure => installed, }
+
package { 'geoip-database': ensure => installed,
}
apache2::module { 'macro': require => Package['libapache2-mod-macro']; }
apache2::module { 'rewrite': }
apache2::module { 'expires': }
apache2::module { 'macro': require => Package['libapache2-mod-macro']; }
apache2::module { 'rewrite': }
apache2::module { 'expires': }
+ apache2::module { 'geoip': require => [Package['libapache2-mod-geoip'], Package['geoip-database']]; }
file { '/usr/local/bin/static-mirror-run':
source => 'puppet:///modules/roles/static-mirroring/static-mirror-run',
file { '/usr/local/bin/static-mirror-run':
source => 'puppet:///modules/roles/static-mirroring/static-mirror-run',
@@
-23,7
+24,7
@@
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;
static-mirror-run --one-stage /srv/static.debian.org bizet.debian.org:-live- > /dev/null
\n",
+ 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",
}
$vhost_listen = $::hostname ? {
}
$vhost_listen = $::hostname ? {
@@
-44,4
+45,10
@@
class roles::static_mirror {
site => "static-vhosts-simple",
content => template('roles/static-mirroring/vhost/static-vhosts-simple.erb'),
}
site => "static-vhosts-simple",
content => template('roles/static-mirroring/vhost/static-vhosts-simple.erb'),
}
+
+ $wwwdo_document_root = '/srv/static.debian.org/mirrors/www.debian.org/cur'
+ apache2::site { '010-www.debian.org':
+ site => 'www.debian.org',
+ content => template('roles/apache-www.debian.org.erb'),
+ }
}
}