From: Martin Zobel-Helas <zobel@debian.org>
Date: Mon, 23 Apr 2012 15:30:15 +0000 (+0200)
Subject: make nagios happy
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=9bc246f1a84765b27b81e11ac525c594a4bad6c2

make nagios happy
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
---

diff --git a/modules/dacs/files/per-host/nono.debian.org/dacs.conf b/modules/dacs/files/per-host/nono.debian.org/dacs.conf
new file mode 100644
index 00000000..5f9c86ef
--- /dev/null
+++ b/modules/dacs/files/per-host/nono.debian.org/dacs.conf
@@ -0,0 +1,48 @@
+<Configuration xmlns="http://dss.ca/dacs/v1.4">
+
+ <Default>
+   FEDERATION_DOMAIN "debian.org"
+   FEDERATION_NAME "DEBIANORG"
+   EVAL ${Conf::JURISDICTION_AUTHSERVER}="sso.debian.org"
+   LOG_LEVEL "notice"
+ </Default>
+ <Jurisdiction uri="nono">
+   JURISDICTION_NAME "DEBIAN"
+   ADMIN_IDENTITY "DEBIAN:zobel"
+ </Jurisdiction>
+ <Jurisdiction uri="*.debian.org">
+   JURISDICTION_NAME "DEBIAN"
+   ADMIN_IDENTITY "DEBIAN:zobel"
+   <Auth id="guest-apache-htpasswd">
+     URL "https://sso.debian.org/cgi-bin/dacs/local_apache_authenticate"
+     STYLE "pass"
+     CONTROL "sufficient"
+     OPTION "AUTH_FILE=/etc/apache2/dsa-guest-web-passwords"
+     OPTION "AUTH_MODULE=mod_auth"
+   </Auth>
+
+   <Auth id="debian-apache-htpasswd">
+     URL "https://sso.debian.org/cgi-bin/dacs/local_apache_authenticate"
+     STYLE "pass"
+     CONTROL "required"
+     OPTION "AUTH_FILE=/var/lib/misc/thishost/web-passwords"
+     OPTION "AUTH_MODULE=mod_auth"
+   </Auth>
+
+<!--
+   <Auth id="ldap">
+     URL "https://sso.debian.org/cgi-bin/dacs/local_ldap_authenticate"
+     STYLE "password"
+     CONTROL "required"
+     LDAP_BIND_METHOD "direct"
+     LDAP_USERNAME_URL* '"ldap://127.0.0.1/uid=" \
+        . encode(url, ${Args::USERNAME}) . ",ou=users,dc=debian,dc=org"'
+     LDAP_USERNAME_EXPR* '"${LDAP::uid}"'
+     LDAP_ROLES_SELECTOR* '"${LDAP::attrname}" eq "supplementaryGid" \
+       ? strtr(ldap(rdn_attrvalue, \
+           ldap(dn_index, "${LDAP::attrvalue}", 1)), " ", "_") \
+       : 0'
+   </Auth>
+ -->
+ </Jurisdiction>
+</Configuration>
diff --git a/modules/dacs/manifests/init.pp b/modules/dacs/manifests/init.pp
index 8c865df6..bd5bd827 100644
--- a/modules/dacs/manifests/init.pp
+++ b/modules/dacs/manifests/init.pp
@@ -43,7 +43,8 @@ class dacs {
 		group   => www-data
 	}
 	file { '/etc/dacs/federations/debian.org/DEBIAN/dacs.conf':
-		source => 'puppet:///modules/dacs/common/dacs.conf',
+		source  => ['puppet:///modules/dacs/per-host/${::fqdn}/dacs.conf',
+			'puppet:///modules/dacs/common/dacs.conf', ],
 		mode    => '0640',
 		owner   => root,
 		group   => www-data