Merge remote-tracking branch 'waldi/rsync-systemd-master'

[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 38bc685..d92bd4d 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -1,7 +1,8 @@
 class roles::static_mirror {
 
        include roles::static_source
-       include apache2::cache
+       include apache2::expires
+       include apache2::rewrite
 
        package { 'libapache2-mod-geoip': ensure => installed, }
        package { 'geoip-database': ensure => installed, }
@@ -69,6 +70,11 @@ class roles::static_mirror {
                ensure  => absent,
        }
 
+       apache2::site { '010-static-vhosts-00-manpages':
+               site   => 'static-manpages.debian.org',
+               ensure  => has_static_component('manpages.debian.org') ? { true => "present", false => "absent" },
+               content => template('roles/static-mirroring/vhost/manpages.debian.org.erb'),
+       }
        apache2::site { '010-static-vhosts-simple':
                site => 'static-vhosts-simple',
                content => template('roles/static-mirroring/vhost/static-vhosts-simple.erb'),
@@ -100,6 +106,7 @@ class roles::static_mirror {
        ssl::service { 'incoming.debian.org'           : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
        ssl::service { 'incoming.ports.debian.org'     : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
        ssl::service { 'lintian.debian.org'            : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+       ssl::service { 'manpages.debian.org'           : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
        ssl::service { 'onion.debian.org'              : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
        ssl::service { 'release.debian.org'            : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
        ssl::service { 'rtc.debian.org'                : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true }
@@ -147,6 +154,7 @@ class roles::static_mirror {
                onion::service { 'blends.debian.org'             : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
                onion::service { 'incoming.debian.org'           : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
                onion::service { 'incoming.ports.debian.org'     : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
+               onion::service { 'manpages.debian.org'           : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
                onion::service { 'lintian.debian.org'            : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
                onion::service { 'onion.debian.org'              : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
                onion::service { 'release.debian.org'            : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }