projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Let the mail front ends handle release
[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
240a6bf
..
aa3e69c
100644
(file)
--- a/
modules/roles/manifests/static_mirror.pp
+++ b/
modules/roles/manifests/static_mirror.pp
@@
-1,14
+1,14
@@
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 { 'geoip-database': 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 { 'rewrite': }
- apache2::module { 'expires': }
+ apache2::module { 'include': }
+ apache2::module { 'ssl': }
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':
@@
-31,8
+31,12
@@
class roles::static_mirror {
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',
default => '*:80',
}
+ $vhost_listen_443 = $::hostname ? {
+ klecker => '130.89.148.14:443 [2001:610:1908:b000::148:14]:443',
+ default => '*:443',
+ }
- 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,13
+46,23
@@
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'),
}
$wwwdo_document_root = '/srv/static.debian.org/mirrors/www.debian.org/cur'
content => template('roles/static-mirroring/vhost/static-vhosts-simple.erb'),
}
$wwwdo_document_root = '/srv/static.debian.org/mirrors/www.debian.org/cur'
- apache2::site { '0
10
-www.debian.org':
+ apache2::site { '0
05
-www.debian.org':
site => 'www.debian.org',
content => template('roles/apache-www.debian.org.erb'),
}
site => 'www.debian.org',
content => template('roles/apache-www.debian.org.erb'),
}
+
+ ssl::service { 'dsa.debian.org':
+ notify => Service['apache2'],
+ }
+ ssl::service { 'www.debian.org':
+ notify => Service['apache2'],
+ }
+ ssl::service { 'rtc.debian.org':
+ notify => Service['apache2'],
+ }
}
}