ordering fixups

[dsa-puppet.git] / modules / dacs / manifests / init.pp

diff --git a/modules/dacs/manifests/init.pp b/modules/dacs/manifests/init.pp
index e49b43f0db65dda8c179ec2cb4187f2bdd06dad1..213887a95be592d641f0849b280f2c845d919b72 100644 (file)
--- a/modules/dacs/manifests/init.pp
+++ b/modules/dacs/manifests/init.pp
@@ -14,10 +14,15 @@ class dacs {
                ensure => installed,
        }
 
+       File {
+               owner => root,
+               group => www-data,
+               mode  => '0640',
+               noop  => true,
+       }
+
        file { '/var/log/dacs':
                ensure  => directory,
-               owner   => root,
-               group   => www-data,
                mode    => '0770',
                purge   => true,
        }
@@ -30,64 +35,38 @@ class dacs {
                        '/etc/dacs/federations/debian.org/DEBIAN/groups/DACS'
                ]:
                ensure  => directory,
-               owner   => root,
-               group   => www-data,
                mode    => '0750',
                require => Package['libapache2-mod-dacs'],
                purge   => true
        }
        file { '/etc/dacs/federations/site.conf':
                source  => 'puppet:///modules/dacs/common/site.conf',
-               mode    => '0640',
-               owner   => root,
-               group   => www-data
        }
        file { '/etc/dacs/federations/debian.org/DEBIAN/dacs.conf':
                source  => [ "puppet:///modules/dacs/per-host/${::fqdn}/dacs.conf",
                        'puppet:///modules/dacs/common/dacs.conf', ],
-               mode    => '0640',
-               owner   => root,
-               group   => www-data
        }
        file { '/etc/dacs/federations/debian.org/DEBIAN/acls/revocations':
                source  => 'puppet:///modules/dacs/common/revocations',
-               mode    => '0640',
-               owner   => root,
-               group   => www-data
        }
        file { '/etc/dacs/federations/debian.org/DEBIAN/groups/DACS/jurisdictions.grp':
                source  => 'puppet:///modules/dacs/common/jurisdictions.grp',
-               mode    => '0640',
-               owner   => root,
-               group   => www-data
        }
        file { '/etc/dacs/federations/debian.org/DEBIAN/acls/acl-noauth.0':
                source  => [ "puppet:///modules/dacs/per-host/${::fqdn}/acl-noauth.0",
                        'puppet:///modules/dacs/common/acl-noauth.0' ],
-               mode    => '0640',
-               owner   => root,
-               group   => www-data,
                notify  => Exec['dacsacl']
        }
        file { '/etc/dacs/federations/debian.org/DEBIAN/acls/acl-private.0':
                source  => [ "puppet:///modules/dacs/per-host/${::fqdn}/acl-private.0",
                        'puppet:///modules/dacs/common/acl-private.0' ],
-               mode    => '0640',
-               owner   => root,
-               group   => www-data,
                notify  => Exec['dacsacl']
        }
        file { '/etc/dacs/federations/debian.org/federation_keyfile':
                source  => 'puppet:///modules/dacs/private/debian.org_federation_keyfile',
-               mode    => '0640',
-               owner   => root,
-               group   => www-data
        }
        file { '/etc/dacs/federations/debian.org/DEBIAN/jurisdiction_keyfile':
                source  => 'puppet:///modules/dacs/private/DEBIAN_jurisdiction_keyfile',
-               mode    => '0640',
-               owner   => root,
-               group   => www-data
        }
 
        exec { 'dacsacl':