projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Remove spohr special case"
[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
c73e69f
..
7d0cfb3
100644
(file)
--- a/
modules/roles/manifests/static_mirror.pp
+++ b/
modules/roles/manifests/static_mirror.pp
@@
-1,6
+1,7
@@
class roles::static_mirror {
include roles::static_source
class roles::static_mirror {
include roles::static_source
+ include apache2::cache
package { 'libapache2-mod-macro': ensure => installed, }
package { 'libapache2-mod-geoip': ensure => installed, }
package { 'libapache2-mod-macro': ensure => installed, }
package { 'libapache2-mod-geoip': ensure => installed, }
@@
-8,7
+9,6
@@
class roles::static_mirror {
apache2::module { 'macro': require => Package['libapache2-mod-macro']; }
apache2::module { 'rewrite': }
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':
apache2::module { 'geoip': require => [Package['libapache2-mod-geoip'], Package['geoip-database']]; }
file { '/usr/local/bin/static-mirror-run':
@@
-32,7
+32,7
@@
class roles::static_mirror {
default => '*:80',
}
default => '*:80',
}
- apache2::config {
"local-static-vhost.conf"
:
+ apache2::config {
'local-static-vhost.conf'
:
content => template('roles/static-mirroring/static-vhost.conf.erb'),
}
content => template('roles/static-mirroring/static-vhost.conf.erb'),
}
@@
-42,7
+42,13
@@
class roles::static_mirror {
}
apache2::site { '010-static-vhosts-simple':
}
apache2::site { '010-static-vhosts-simple':
- site =>
"static-vhosts-simple"
,
+ site =>
'static-vhosts-simple'
,
content => template('roles/static-mirroring/vhost/static-vhosts-simple.erb'),
}
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'),
+ }
}
}