]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
I think this will work
authorStephen Gran <steve@lobefin.net>
Sun, 20 May 2012 20:16:01 +0000 (21:16 +0100)
committerStephen Gran <steve@lobefin.net>
Sun, 20 May 2012 20:16:01 +0000 (21:16 +0100)
Signed-off-by: Stephen Gran <steve@lobefin.net>
modules/rsync/manifests/init.pp
modules/rsync/manifests/site.pp

index dfc766437d4442a82452ac9be04ad291365074fc..267b59c5364cf5f88fc2b8d95a30dcffd9c3206e 100644 (file)
@@ -2,23 +2,19 @@ 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/rsync/logrotate.d-dsa-rsyncd',
-               noop    => true,
                require => Package['debian.org'],
        }
        file { '/var/log/rsyncd':
                ensure => directory,
-               noop   => true,
                mode   => '0755',
        }
 
index 6151e912c51f0826667837e0e435a5ef6525c337..a0129466cda3a52f3fda3ded983d6ded38749c69 100644 (file)
@@ -21,13 +21,11 @@ define rsync::site (
        if $source {
                file { $fname:
                        ensure => $ensure,
-                       noop   => true,
                        source => $source
                }
        } elsif $content {
                file { $fname:
                        ensure  => $ensure,
-                       noop    => true,
                        content => $content,
                }
        } else {
@@ -35,7 +33,6 @@ define rsync::site (
        }
 
        xinetd::service { "rsync-${name}":
-               noop        => true,
                bind        => $bind,
                id          => "${name}-rsync",
                server      => '/usr/sbin/rsyncd',