X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=96e607cac9082b31e91f1e0e3011b46dcf9d1de4;hb=7a1f45cf027a1459319e73f486983bbcbf51772b;hp=66c7f5214aed591e0b5f41b55a03d719ce6fd8a5;hpb=b4bd9d1597398fd8dd6db5403abee996449c804a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 66c7f5214..96e607cac 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -10,6 +10,8 @@ class roles::static_mirror {
 	include apache2::ssl
 	apache2::module { 'include': }
 	apache2::module { 'geoip': require => [Package['libapache2-mod-geoip'], Package['geoip-database']]; }
+	apache2::module { 'deflate': }
+	apache2::module { 'filter': }
 
 	file { '/usr/local/bin/static-mirror-run':
 		source => 'puppet:///modules/roles/static-mirroring/static-mirror-run',
@@ -21,9 +23,7 @@ class roles::static_mirror {
 		mode   => '0555',
 	}
 
-	file { '/etc/cron.d/puppet-static-mirror':
-		ensure => absent,
-	}
+	file { '/etc/cron.d/puppet-static-mirror': ensure => absent, }
 	concat::fragment { 'dsa-puppet-stuff--static-mirror':
 		target => '/etc/cron.d/dsa-puppet-stuff',
 		content  => @(EOF)
@@ -32,7 +32,6 @@ class roles::static_mirror {
 	}
 
 	$onion_v4_addr = $::hostname ? {
-		busoni     => '140.211.166.202',
 		klecker    => '130.89.148.14',
 		mirror-isc => '149.20.4.15',
 		senfter    => '5.153.231.4',
@@ -99,6 +98,7 @@ class roles::static_mirror {
 	ssl::service { 'backports.debian.org'          : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'bits.debian.org'               : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'blends.debian.org'             : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'cdbuilder-logs.debian.org'     : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true }
 	ssl::service { 'd-i.debian.org'                : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true }
 	ssl::service { 'deb.debian.org'                : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true }
 	ssl::service { 'dpl.debian.org'                : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true }
@@ -163,6 +163,7 @@ class roles::static_mirror {
 		onion::service { 'backports.debian.org'          : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
 		onion::service { 'bits.debian.org'               : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
 		onion::service { 'blends.debian.org'             : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
+		onion::service { 'cdbuilder-logs.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 { 'lintian.debian.org'            : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }