X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdacs%2Ffiles%2Fper-host%2Fnono.debian.org%2Fdacs.conf;h=599842db74ef85168f0ca5fc3e43dcc7ccba5cb7;hb=6f386ff246dcca0ebaffe0c6e6795733ecd6580d;hp=5f9c86eff6430d3960b9a9fe289b1dff4e8d7d51;hpb=9bc246f1a84765b27b81e11ac525c594a4bad6c2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/dacs/files/per-host/nono.debian.org/dacs.conf b/modules/dacs/files/per-host/nono.debian.org/dacs.conf
index 5f9c86eff..599842db7 100644
--- a/modules/dacs/files/per-host/nono.debian.org/dacs.conf
+++ b/modules/dacs/files/per-host/nono.debian.org/dacs.conf
@@ -6,9 +6,24 @@
    EVAL ${Conf::JURISDICTION_AUTHSERVER}="sso.debian.org"
    LOG_LEVEL "notice"
  </Default>
- <Jurisdiction uri="nono">
+ <Jurisdiction uri="206.12.19.123">
    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>
  </Jurisdiction>
  <Jurisdiction uri="*.debian.org">
    JURISDICTION_NAME "DEBIAN"
@@ -28,21 +43,5 @@
      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>