X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Frsync%2Fmanifests%2Fsite.pp;h=bb2ee1446170260dab55fa5bd34b38e07e8f6196;hb=e3602623219a1986804c6e95b19971685bf94364;hp=13d90dc7f9f16ad1298c060d6bbd1292f7c09a61;hpb=650335318c9021ace96b0cb6d49a13c1a472271f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/rsync/manifests/site.pp b/modules/rsync/manifests/site.pp
index 13d90dc7f..bb2ee1446 100644
--- a/modules/rsync/manifests/site.pp
+++ b/modules/rsync/manifests/site.pp
@@ -2,13 +2,18 @@ define rsync::site (
 	$bind='',
 	$source='',
 	$content='',
-	$fname='/etc/rsyncd.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 +24,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 +40,12 @@ 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]
 	}
 
 	Service['rsync']->Service['xinetd']