X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsyncproxy.pp;h=202cabda03a37e01383ed8465199f9bb01fbf53f;hb=9dff55b7bb4bf4377c80bc636ca14bf45a5ce041;hp=b2fd6d4ab047fd30ee8b6613cf238c148a6ade60;hpb=6a59b7f5b40a60504425a237d404837345aa358b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp
index b2fd6d4ab..202cabda0 100644
--- a/modules/roles/manifests/syncproxy.pp
+++ b/modules/roles/manifests/syncproxy.pp
@@ -24,12 +24,6 @@ class roles::syncproxy {
 		default => 'unknown'
 	}
 
-	rsync::site { 'syncproxy':
-		content => template('roles/syncproxy/rsyncd.conf.erb'),
-		bind    => $bind,
-		bind6   => $bind6,
-	}
-
 	file { '/etc/rsyncd':
 		ensure => 'directory'
 	}
@@ -41,8 +35,13 @@ class roles::syncproxy {
 	}
 
 	if $::apache2 and $syncproxy_name != 'unknown' {
+		include apache2::ssl
+		ssl::service { "$syncproxy_name":
+			notify => Service['apache2'],
+			key => true,
+		}
 		apache2::site { '010-syncproxy.debian.org':
-			site   => 'security.debian.org',
+			site   => 'syncproxy.debian.org',
 			content => template('roles/syncproxy/syncproxy.debian.org-apache.erb')
 		}
 
@@ -53,5 +52,18 @@ class roles::syncproxy {
 		file { '/srv/www/syncproxy.debian.org/htdocs/index.html':
 			content => template('roles/syncproxy/syncproxy.debian.org-index.html.erb')
 		}
+
+		rsync::site { 'syncproxy':
+			content => template('roles/syncproxy/rsyncd.conf.erb'),
+			bind    => $bind,
+			bind6   => $bind6,
+			sslname => "$syncproxy_name",
+		}
+	} else {
+		rsync::site { 'syncproxy':
+			content => template('roles/syncproxy/rsyncd.conf.erb'),
+			bind    => $bind,
+			bind6   => $bind6,
+		}
 	}
 }