X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Frsync%2Fmanifests%2Fsite.pp;h=c534b372bf1a38a51ec73dfb9cea8fcd1692df94;hb=f7e0f993132d508cee94cf091f953ceefaf13c9c;hp=21b56639442d4d33c2f803e12b3bb522b18ae76b;hpb=c694c8542b1b971f6ef32b4dded31a64e70a7486;p=mirror%2Fdsa-puppet.git

diff --git a/modules/rsync/manifests/site.pp b/modules/rsync/manifests/site.pp
index 21b566394..c534b372b 100644
--- a/modules/rsync/manifests/site.pp
+++ b/modules/rsync/manifests/site.pp
@@ -1,5 +1,6 @@
 define rsync::site (
 	$bind='',
+	$bind6='',
 	$source='',
 	$content='',
 	$fname='',
@@ -40,13 +41,29 @@ define rsync::site (
 	xinetd::service { "rsync-${name}":
 		bind        => $bind,
 		id          => "${name}-rsync",
-		server      => '/usr/sbin/rsyncd',
+		server      => '/usr/bin/rsync',
 		port        => 'rsync',
-		server_args => $fname_real,
+		server_args => "--daemon --config=${fname_real}",
 		ferm        => false,
 		instances   => $max_clients,
 		require     => File[$fname_real]
 	}
 
+	if $bind6 != '' {
+		if $bind == '' {
+			fail("Cannot listen on * and a specific ipv6 address")
+		}
+		xinetd::service { "rsync-${name}6":
+			bind        => $bind6,
+			id          => "${name}-rsync6",
+			server      => '/usr/bin/rsync',
+			port        => 'rsync',
+			server_args => "--daemon --config=${fname_real}",
+			ferm        => false,
+			instances   => $max_clients,
+			require     => File[$fname_real]
+		}
+	}
+
 	Service['rsync']->Service['xinetd']
 }