X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fdacs%2Fmanifests%2Finit.pp;h=79cf4841f651e84d212cee1c55419266f321288b;hb=40e62462f0c49cb1642a33bae8adc302f8595694;hp=c5f46f2aa1872033f82487b4a116429436c5d9c0;hpb=2c1dd528dcfc1f07294492c6a17db011e2b6b055;p=dsa-puppet.git

diff --git a/modules/dacs/manifests/init.pp b/modules/dacs/manifests/init.pp
index c5f46f2a..79cf4841 100644
--- a/modules/dacs/manifests/init.pp
+++ b/modules/dacs/manifests/init.pp
@@ -5,7 +5,15 @@ class dacs {
     }
 
     file {
+        "/var/log/dacs":
+             ensure  => directory,
+             owner   => root,
+             group   => www-data,
+             mode    => 770,
+             purge   => true
+             ;
         "/etc/dacs/federations":
+             require => Package["libapache2-mod-dacs"],
              ensure  => directory,
              owner   => root,
              group   => www-data,
@@ -14,6 +22,7 @@ class dacs {
              ;
 
         "/etc/dacs/federations/debian.org/":
+             require => Package["libapache2-mod-dacs"],
              ensure  => directory,
              owner   => root,
              group   => www-data,
@@ -22,6 +31,7 @@ class dacs {
              ;
 
         "/etc/dacs/federations/debian.org/DEBIAN":
+             require => Package["libapache2-mod-dacs"],
              ensure  => directory,
              owner   => root,
              group   => www-data,
@@ -30,6 +40,7 @@ class dacs {
              ;
 
         "/etc/dacs/federations/debian.org/DEBIAN/acls":
+             require => Package["libapache2-mod-dacs"],
              ensure  => directory,
              owner   => root,
              group   => www-data,
@@ -38,6 +49,7 @@ class dacs {
              ;
         
         "/etc/dacs/federations/debian.org/DEBIAN/groups":
+             require => Package["libapache2-mod-dacs"],
              ensure  => directory,
              owner   => root,
              group   => www-data,
@@ -46,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,
@@ -54,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,
@@ -62,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,
@@ -70,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,
@@ -78,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,
@@ -86,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,
@@ -95,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,
@@ -104,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,
@@ -111,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,
@@ -121,7 +142,7 @@ class dacs {
 
     exec {
         "dacsacl":
-            command     => "dacsacl -sc /etc/dacs/federations/site.conf -c /etc/dacs/federations/debian.org/DEBIAN/dacs.conf -uj DEBIAN && chown root:www-data /etc/dacs/federations/debian.org/DEBIAN/acls/INDEX"
+            command     => "dacsacl -sc /etc/dacs/federations/site.conf -c /etc/dacs/federations/debian.org/DEBIAN/dacs.conf -uj DEBIAN && chown root:www-data /etc/dacs/federations/debian.org/DEBIAN/acls/INDEX",
             refreshonly => true,
     }