From: Martin Zobel-Helas <zobel@debian.org>
Date: Thu, 16 Feb 2012 17:02:55 +0000 (+0100)
Subject: and add the jurisdictions.grp
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=846552c074b6ffed41604ae1f0e6ba43b291849a

and add the jurisdictions.grp
---

diff --git a/modules/dacs/files/common/jurisdictions.grp b/modules/dacs/files/common/jurisdictions.grp
new file mode 100644
index 00000000..eaae094f
--- /dev/null
+++ b/modules/dacs/files/common/jurisdictions.grp
@@ -0,0 +1,9 @@
+<groups xmlns="http://dss.ca/dacs/v1.4">
+ <group_definition jurisdiction="DEBIAN" name="jurisdictions"
+     mod_date="Tue, 14-Jun-2005 16:06:00 GMT" type="public">
+   <group_member jurisdiction="DEBIAN" name="DEBIAN Jurisdiction" type="meta"
+     alt_name="Test Jurisdiction for DEBIAN"
+     dacs_url="http://sso.debian.org/cgi-bin/dacs"
+     authenticates="yes" prompts="no"/>
+ </group_definition>
+</groups>
diff --git a/modules/dacs/manifests/init.pp b/modules/dacs/manifests/init.pp
index 44b39384..205333c3 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" ],