X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdacs%2Fmanifests%2Finit.pp;h=3eb9392002667370ac855cfb3ea2286465d0fd04;hb=d2e73a9e90b6d671c545ba2c552239bf55e1f20f;hp=8c865df61f868d0d4870b0b73019251ebf5b85fb;hpb=61b1f29e849df28f2892efc5f98318611e99eeeb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/dacs/manifests/init.pp b/modules/dacs/manifests/init.pp
index 8c865df61..3eb939200 100644
--- a/modules/dacs/manifests/init.pp
+++ b/modules/dacs/manifests/init.pp
@@ -14,10 +14,14 @@ class dacs {
 		ensure => installed,
 	}
 
+	File {
+		owner => root,
+		group => www-data,
+		mode  => '0640',
+	}
+
 	file { '/var/log/dacs':
 		ensure  => directory,
-		owner   => root,
-		group   => www-data,
 		mode    => '0770',
 		purge   => true,
 	}
@@ -30,63 +34,44 @@ 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/logrotate.d/dacs':
+		content => template('dacs/dacs.logrotate.erb'),
+		owner => root,
+		group => root,
+		mode  => '0644',
+	}
 	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/common/dacs.conf',
-		mode    => '0640',
-		owner   => root,
-		group   => www-data
+		source  => [ "puppet:///modules/dacs/per-host/${::fqdn}/dacs.conf",
+			'puppet:///modules/dacs/common/dacs.conf', ],
 	}
 	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':