X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Frsync%2Fmanifests%2Finit.pp;h=1b66a2898b138c3f3a5451ebeb053fe6006f4a9c;hb=c46ff2155be94c3e1c3226879e13a8f31dbbac1b;hp=7671c6f2ddb22d8f29c112b6033bbb52f19d8ca7;hpb=b98544412fd3916437b2250481b8a77c5edef40e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/rsync/manifests/init.pp b/modules/rsync/manifests/init.pp
index 7671c6f2d..1b66a2898 100644
--- a/modules/rsync/manifests/init.pp
+++ b/modules/rsync/manifests/init.pp
@@ -2,30 +2,29 @@ class rsync {
 
 	package { 'rsync':
 		ensure => installed,
-		noop   => true,
 	}
 
 	service { 'rsync':
 		ensure  => stopped,
-		noop    => true,
 		require => Package['rsync'],
 	}
 
 	file { '/etc/logrotate.d/dsa-rsyncd':
-		source  => 'puppet:///modules/rsyncd-log/logrotate.d-dsa-rsyncd',
-		noop    => true,
+		source  => 'puppet:///modules/rsync/logrotate.d-dsa-rsyncd',
 		require => Package['debian.org'],
 	}
 	file { '/var/log/rsyncd':
 		ensure => directory,
-		noop   => true,
 		mode   => '0755',
 	}
 
-	@ferm::rule { 'dsa-rsync':
+	ferm::rule { 'dsa-rsync':
 		domain      => '(ip ip6)',
 		description => 'Allow rsync access',
 		rule        => '&SERVICE(tcp, 873)'
 	}
 
+	file { '/usr/local/sbin/systemd-cleanup-failed-rsyncs':
+		ensure => absent,
+	}
 }