From: Martin Zobel-Helas <zobel@debian.org>
Date: Mon, 20 Feb 2012 11:03:13 +0000 (+0100)
Subject: fix log directory permissions, add dependency to libapache2-mod-dacs
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=dc407ae509b2b84ef6de08f6037dba4457d00c0c

fix log directory permissions, add dependency to libapache2-mod-dacs
---

diff --git a/modules/dacs/manifests/init.pp b/modules/dacs/manifests/init.pp
index 69802ecc..87c852ca 100644
--- a/modules/dacs/manifests/init.pp
+++ b/modules/dacs/manifests/init.pp
@@ -7,12 +7,13 @@ class dacs {
     file {
         "/var/log/dacs":
              ensure  => directory,
-             owner   => www-data,
-             group   => root,
-             mode    => 750,
+             owner   => root
+             group   => www-data,
+             mode    => 770,
              purge   => true
              ;
         "/etc/dacs/federations":
+             require => Package["libapache2-mod-dacs"],
              ensure  => directory,
              owner   => root,
              group   => www-data,
@@ -21,6 +22,7 @@ class dacs {
              ;
 
         "/etc/dacs/federations/debian.org/":
+             require => Package["libapache2-mod-dacs"],
              ensure  => directory,
              owner   => root,
              group   => www-data,
@@ -29,6 +31,7 @@ class dacs {
              ;
 
         "/etc/dacs/federations/debian.org/DEBIAN":
+             require => Package["libapache2-mod-dacs"],
              ensure  => directory,
              owner   => root,
              group   => www-data,
@@ -37,6 +40,7 @@ class dacs {
              ;
 
         "/etc/dacs/federations/debian.org/DEBIAN/acls":
+             require => Package["libapache2-mod-dacs"],
              ensure  => directory,
              owner   => root,
              group   => www-data,
@@ -45,6 +49,7 @@ class dacs {
              ;
         
         "/etc/dacs/federations/debian.org/DEBIAN/groups":
+             require => Package["libapache2-mod-dacs"],
              ensure  => directory,
              owner   => root,
              group   => www-data,
@@ -53,6 +58,7 @@ class dacs {
              ;
 
         "/etc/dacs/federations/debian.org/DEBIAN/groups/DACS":
+             require => Package["libapache2-mod-dacs"],
              ensure  => directory,
              owner   => root,
              group   => www-data,
@@ -61,6 +67,7 @@ class dacs {
              ;
 
         "/etc/dacs/federations/site.conf":
+             require => Package["libapache2-mod-dacs"],
              source  => [ "puppet:///modules/dacs/per-host/$fqdn/site.conf",
                           "puppet:///modules/dacs/common/site.conf" ],
              mode    => 640,
@@ -69,6 +76,7 @@ class dacs {
              ;
 
         "/etc/dacs/federations/debian.org/DEBIAN/dacs.conf":
+             require => Package["libapache2-mod-dacs"],
              source  => [ "puppet:///modules/dacs/per-host/$fqdn/dacs.conf",
                           "puppet:///modules/dacs/common/dacs.conf" ],
              mode    => 640,
@@ -77,6 +85,7 @@ class dacs {
              ;
 
         "/etc/dacs/federations/debian.org/DEBIAN/acls/revocations":
+             require => Package["libapache2-mod-dacs"],
              source  => [ "puppet:///modules/dacs/per-host/$fqdn/revocations",
                           "puppet:///modules/dacs/common/revocations" ],
              mode    => 640,
@@ -85,6 +94,7 @@ class dacs {
              ;
 
         "/etc/dacs/federations/debian.org/DEBIAN/groups/DACS/jurisdictions.grp":
+             require => Package["libapache2-mod-dacs"],
              source  => [ "puppet:///modules/dacs/per-host/$fqdn/jurisdictions.grp",
                           "puppet:///modules/dacs/common/jurisdictions.grp" ],
              mode    => 640,
@@ -93,6 +103,7 @@ class dacs {
              ;
 
         "/etc/dacs/federations/debian.org/DEBIAN/acls/acl-noauth.0":
+             require => Package["libapache2-mod-dacs"],
              source  => [ "puppet:///modules/dacs/per-host/$fqdn/acl-noauth.0",
                           "puppet:///modules/dacs/common/acl-noauth.0" ],
              mode    => 640,
@@ -102,6 +113,7 @@ class dacs {
              ;
 
         "/etc/dacs/federations/debian.org/DEBIAN/acls/acl-private.0":
+             require => Package["libapache2-mod-dacs"],
              source  => [ "puppet:///modules/dacs/per-host/$fqdn/acl-private.0",
                           "puppet:///modules/dacs/common/acl-private.0" ],
              mode    => 640,
@@ -111,6 +123,7 @@ class dacs {
              ;
 
         "/etc/dacs/federations/debian.org/federation_keyfile":
+             require => Package["libapache2-mod-dacs"],
              source  => "puppet:///modules/dacs/private/debian.org_federation_keyfile",
              mode    => 640,
              owner   => root,
@@ -118,6 +131,7 @@ class dacs {
              ;
 
         "/etc/dacs/federations/debian.org/DEBIAN/jurisdiction_keyfile":
+             require => Package["libapache2-mod-dacs"],
              source  => "puppet:///modules/dacs/private/DEBIAN_jurisdiction_keyfile",
              mode    => 640,
              owner   => root,