X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsnapshot_web.pp;h=b4d6703aff5487b8634f4996903a2a486c308718;hb=6421c571fd4794f93352a80c0110ff33b1f6c60d;hp=3067981912a9ab69719c9522293ade274ebaec4e;hpb=04790f2b889aea6382f66a92370a43b5be65b62b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/snapshot_web.pp b/modules/roles/manifests/snapshot_web.pp
index 306798191..b4d6703af 100644
--- a/modules/roles/manifests/snapshot_web.pp
+++ b/modules/roles/manifests/snapshot_web.pp
@@ -8,10 +8,6 @@ class roles::snapshot_web {
 		ensure => 'installed',
 	})
 
-	ssl::service { 'snapshot.debian.org':
-		notify  => Exec['service apache2 reload'],
-		key => true,
-	}
 	apache2::site { '020-snapshot.debian.org':
 		site   => 'snapshot.debian.org',
 		content => template('roles/snapshot/snapshot.debian.org.conf.erb')
@@ -33,9 +29,8 @@ class roles::snapshot_web {
 		}
 	}
 
-	@ferm::rule { 'dsa-snapshot-varnish-v4':
-		rule  => '&SERVICE(tcp, 6081)',
-	}
+	# varnish cache
+	###############
 	@ferm::rule { 'dsa-nat-snapshot-varnish-v4':
 		table => 'nat',
 		chain => 'PREROUTING',
@@ -51,6 +46,7 @@ class roles::snapshot_web {
 		content => template('roles/snapshot/snapshot.debian.org.vcl.erb'),
 	}
 
+	# the ipv6 port 80 is owned by varnish
 	file { '/etc/apache2/ports.conf':
 		content  => @("EOF"),
 			Listen 0.0.0.0:80
@@ -59,4 +55,17 @@ class roles::snapshot_web {
 		require => Package['apache2'],
 		notify  => Service['apache2'],
 	}
+
+	# haproxy ssl termination
+	#########################
+	include haproxy
+	file { '/etc/haproxy/haproxy.cfg':
+		content => template('roles/snapshot/haproxy.cfg.erb'),
+		require => Package['haproxy'],
+		notify  => Service['haproxy'],
+	}
+	ssl::service { 'snapshot.debian.org':
+		notify  => Service['haproxy'],
+		key => true,
+	}
 }