X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsyncproxy.pp;h=3101025d10160127803e37911f5a39afa3a17834;hb=6d3f386e0e197b73d031d3276d969170ed868766;hp=3bdadcd3bffa86775c2a85305ee319f1917b9b2a;hpb=7bfdedf3e3de81310dcbd7d50c3f9b290b105279;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp
index 3bdadcd3b..3101025d1 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'
 	}
@@ -42,7 +36,10 @@ class roles::syncproxy {
 
 	if $::apache2 and $syncproxy_name != 'unknown' {
 		include apache2::ssl
-		ssl::service { "$syncproxy_name": notify => Service['apache2'], key => true, }
+		ssl::service { "$syncproxy_name":
+			notify  => Exec['service apache2 reload'],
+			key => true,
+		}
 		apache2::site { '010-syncproxy.debian.org':
 			site   => 'syncproxy.debian.org',
 			content => template('roles/syncproxy/syncproxy.debian.org-apache.erb')
@@ -56,40 +53,17 @@ class roles::syncproxy {
 			content => template('roles/syncproxy/syncproxy.debian.org-index.html.erb')
 		}
 
-		file { '/etc/rsyncd-syncproxy-stunnel.conf':
-			content => template('roles/syncproxy/rsyncd-syncproxy-stunnel.conf.erb')
-		}
-		xinetd::service { "rsync-syncproxy-ssl":
-			bind        => $bind,
-			id          => "syncproxy-rsync-ssl",
-			server      => '/usr/bin/stunnel4',
-			service     => 'rsync-ssl',
-			type        => 'UNLISTED',
-			port        => '1873',
-			server_args => "/etc/rsyncd-syncproxy-stunnel.conf",
-			ferm        => false,
-			instances   => 50,
-			require     => File[/etc/rsyncd-syncproxy-stunnel.conf],
+		rsync::site { 'syncproxy':
+			content => template('roles/syncproxy/rsyncd.conf.erb'),
+			bind    => $bind,
+			bind6   => $bind6,
+			sslname => "$syncproxy_name",
 		}
-
-		if $bind6 != '' {
-			xinetd::service { "rsync-syncproxy-ssl6":
-				bind        => $bind6,
-				id          => "syncproxy-rsync-ssl",
-				server      => '/usr/bin/stunnel4',
-				service     => 'rsync-ssl',
-				type        => 'UNLISTED',
-				port        => '1873',
-				server_args => "/etc/rsyncd-syncproxy-stunnel.conf",
-				ferm        => false,
-				instances   => 50,
-				require     => File[/etc/rsyncd-syncproxy-stunnel.conf],
-			}
-		}
-
-		@ferm::rule { "dsa-rsync-ssl":
-			description => "Allow traffic to rsync ssl",
-			rule        => "&SERVICE(${protocol}, 1873)"
+	} else {
+		rsync::site { 'syncproxy':
+			content => template('roles/syncproxy/rsyncd.conf.erb'),
+			bind    => $bind,
+			bind6   => $bind6,
 		}
 	}
 }