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

diff --git a/modules/dacs/manifests/init.pp b/modules/dacs/manifests/init.pp
index 44b39384..c5f46f2a 100644
--- a/modules/dacs/manifests/init.pp
+++ b/modules/dacs/manifests/init.pp
@@ -45,6 +45,14 @@ class dacs {
              purge   => true
              ;
 
+        "/etc/dacs/federations/debian.org/DEBIAN/groups/DACS":
+             ensure  => directory,
+             owner   => root,
+             group   => www-data,
+             mode    => 750,
+             purge   => true
+             ;
+
         "/etc/dacs/federations/site.conf":
              source  => [ "puppet:///modules/dacs/per-host/$fqdn/site.conf",
                           "puppet:///modules/dacs/common/site.conf" ],
@@ -69,6 +77,14 @@ class dacs {
              group   => www-data
              ;
 
+        "/etc/dacs/federations/debian.org/DEBIAN/groups/DACS/jurisdictions.grp":
+             source  => [ "puppet:///modules/dacs/per-host/$fqdn/jurisdictions.grp",
+                          "puppet:///modules/dacs/common/jurisdictions.grp" ],
+             mode    => 640,
+             owner   => root,
+             group   => www-data
+             ;
+
         "/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" ],
@@ -105,7 +121,7 @@ class dacs {
 
     exec {
         "dacsacl":
-            command     => "dacsacl -uj DEBIAN",
+            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,
     }