From: Martin Zobel-Helas <zobel@debian.org>
Date: Fri, 9 Mar 2012 12:48:04 +0000 (+0100)
Subject: we now have webPasswords exported from ud-ldap
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=e783770ea12b57e3428d6213a2191a29eb3c8336

we now have webPasswords exported from ud-ldap
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
---

diff --git a/modules/dacs/files/common/dacs.conf b/modules/dacs/files/common/dacs.conf
index 2e39d016..5c8f33a4 100644
--- a/modules/dacs/files/common/dacs.conf
+++ b/modules/dacs/files/common/dacs.conf
@@ -17,7 +17,6 @@
      OPTION "AUTH_MODULE=mod_auth"
    </Auth>
 
-   <!-- Authenticate using webPassword from LDAP
    <Auth id="debian-apache-htpasswd">
      URL "https://sso.debian.org/cgi-bin/dacs/local_apache_authenticate"
      STYLE "pass"
@@ -25,8 +24,8 @@
      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"
@@ -40,5 +39,6 @@
            ldap(dn_index, "${LDAP::attrvalue}", 1)), " ", "_") \
        : 0'
    </Auth>
+ -->
  </Jurisdiction>
 </Configuration>