projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
roles: make use of porterbox uninstall features
[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
aa3e69c
..
3a614a9
100644
(file)
--- a/
modules/roles/manifests/static_mirror.pp
+++ b/
modules/roles/manifests/static_mirror.pp
@@
-6,7
+6,6
@@
class roles::static_mirror {
package { 'libapache2-mod-geoip': ensure => installed, }
package { 'geoip-database': ensure => installed, }
package { 'libapache2-mod-geoip': ensure => installed, }
package { 'geoip-database': ensure => installed, }
- apache2::module { 'rewrite': }
apache2::module { 'include': }
apache2::module { 'ssl': }
apache2::module { 'geoip': require => [Package['libapache2-mod-geoip'], Package['geoip-database']]; }
apache2::module { 'include': }
apache2::module { 'ssl': }
apache2::module { 'geoip': require => [Package['libapache2-mod-geoip'], Package['geoip-database']]; }
@@
-45,6
+44,11
@@
class roles::static_mirror {
content => template('roles/static-mirroring/vhost/planet.debian.org.erb'),
}
content => template('roles/static-mirroring/vhost/planet.debian.org.erb'),
}
+ apache2::site { '010-lintian.debian.org':
+ site => 'lintian.debian.org',
+ content => template('roles/static-mirroring/vhost/lintian.debian.org.erb'),
+ }
+
apache2::site { '010-static-vhosts-simple':
site => 'static-vhosts-simple',
content => template('roles/static-mirroring/vhost/static-vhosts-simple.erb'),
apache2::site { '010-static-vhosts-simple':
site => 'static-vhosts-simple',
content => template('roles/static-mirroring/vhost/static-vhosts-simple.erb'),
@@
-62,6
+66,12
@@
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'],
}