From c694c8542b1b971f6ef32b4dded31a64e70a7486 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 20 May 2012 21:21:24 +0100 Subject: [PATCH] sigh, scoping still sucks Signed-off-by: Stephen Gran --- modules/rsync/manifests/site.pp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/rsync/manifests/site.pp b/modules/rsync/manifests/site.pp index 9ec16ab0..21b56639 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-${title}.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, } @@ -37,10 +42,10 @@ define rsync::site ( id => "${name}-rsync", server => '/usr/sbin/rsyncd', port => 'rsync', - server_args => $fname, + server_args => $fname_real, ferm => false, instances => $max_clients, - require => File[$fname] + require => File[$fname_real] } Service['rsync']->Service['xinetd'] -- 2.39.2