X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Frsync%2Fmanifests%2Fsite.pp;h=c534b372bf1a38a51ec73dfb9cea8fcd1692df94;hb=20837932686b93b71481bb8ee38c902d06b25fa2;hp=a0129466cda3a52f3fda3ded983d6ded38749c69;hpb=79029f88dd3b043bc0f1d7b3ac0232b6ea965954;p=mirror%2Fdsa-puppet.git

diff --git a/modules/rsync/manifests/site.pp b/modules/rsync/manifests/site.pp
index a0129466c..c534b372b 100644
--- a/modules/rsync/manifests/site.pp
+++ b/modules/rsync/manifests/site.pp
@@ -1,14 +1,20 @@
 define rsync::site (
 	$bind='',
+	$bind6='',
 	$source='',
 	$content='',
-	$fname="/etc/rsyncd-${name}.conf",
+	$fname='',
 	$max_clients=200,
 	$ensure=present
 ){
 
 	include rsync
 
+	if ! $fname {
+		$fname_real = "/etc/rsyncd-${name}.conf"
+	} else {
+		$fname_real = $fname
+	}
 	case $ensure {
 		present,absent: {}
 		default: { fail ( "Invald ensure `${ensure}' for ${name}" ) }
@@ -19,12 +25,12 @@ define rsync::site (
 	}
 
 	if $source {
-		file { $fname:
+		file { $fname_real:
 			ensure => $ensure,
 			source => $source
 		}
 	} elsif $content {
-		file { $fname:
+		file { $fname_real:
 			ensure  => $ensure,
 			content => $content,
 		}
@@ -35,12 +41,28 @@ 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,
+		server_args => "--daemon --config=${fname_real}",
 		ferm        => false,
 		instances   => $max_clients,
-		require     => File[$fname]
+		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']