From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 31 Jan 2016 21:54:49 +0000 (+0100)
Subject: rsync ssl service, more
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7bfdedf3e3de81310dcbd7d50c3f9b290b105279;p=mirror%2Fdsa-puppet.git

rsync ssl service, more
---

diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp
index e61752707..3bdadcd3b 100644
--- a/modules/roles/manifests/syncproxy.pp
+++ b/modules/roles/manifests/syncproxy.pp
@@ -59,31 +59,31 @@ class roles::syncproxy {
 		file { '/etc/rsyncd-syncproxy-stunnel.conf':
 			content => template('roles/syncproxy/rsyncd-syncproxy-stunnel.conf.erb')
 		}
-		xinetd::service { "rsync-${name}-ssl":
+		xinetd::service { "rsync-syncproxy-ssl":
 			bind        => $bind,
-			id          => "${name}-rsync-ssl",
+			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   => $max_clients,
-			require     => File[/etc/rsyncd-syncproxy-stunnel.conf]
+			instances   => 50,
+			require     => File[/etc/rsyncd-syncproxy-stunnel.conf],
 		}
 
 		if $bind6 != '' {
-			xinetd::service { "rsync-${name}-ssl6":
+			xinetd::service { "rsync-syncproxy-ssl6":
 				bind        => $bind6,
-				id          => "${name}-rsync-ssl",
+				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   => $max_clients,
-				require     => File[/etc/rsyncd-syncproxy-stunnel.conf]
+				instances   => 50,
+				require     => File[/etc/rsyncd-syncproxy-stunnel.conf],
 			}
 		}