X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=e27f8a21d56a3e563960875a3be0c27731f62a3d;hb=236efe8e28f32419ddc5b4445780bd17775adaf3;hp=b113b6b9823338289e43d150bd21ab112a1ecbf7;hpb=f6a4eb4d0eb7078ffb261191abab23801e12db17;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index b113b6b98..e27f8a21d 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -116,6 +116,7 @@ class roles::static_mirror {
 	}
 	ssl::service { 'mirror-master.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 { 'openpgpkey.debian.org'         : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'pkg-ruby-extras.alioth.debian.org' : ensure => "present",  notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'planet-backend.debian.org'     :
 		ensure => has_static_component('planet.debian.org') ? { true => "present", false => "absent" },
@@ -157,6 +158,7 @@ class roles::static_mirror {
 	ssl::service { 'miniconf10.debconf.org'        : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'video.debconf.org'             : ensure => "present",  notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'wiki.debconf.org'              : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	include apache2::proxy_http
 	ssl::service { 'www.debconf.org'               : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 
 	if has_role('static_mirror_onion') {
@@ -182,6 +184,7 @@ class roles::static_mirror {
 		onion::service { 'manpages.debian.org'           : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
 		onion::service { 'mirror-master.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 { 'openpgpkey.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 }
 		onion::service { 'security-team.debian.org'      : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
 		onion::service { 'www.ports.debian.org'          : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }