projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
munin needs special treatment.
[mirror/dsa-puppet.git]
/
modules
/
dacs
/
files
/
common
/
dacs.conf
diff --git
a/modules/dacs/files/common/dacs.conf
b/modules/dacs/files/common/dacs.conf
index
d0085d0
..
2e39d01
100644
(file)
--- a/
modules/dacs/files/common/dacs.conf
+++ b/
modules/dacs/files/common/dacs.conf
@@
-16,6
+16,8
@@
OPTION "AUTH_FILE=/etc/apache2/dsa-guest-web-passwords"
OPTION "AUTH_MODULE=mod_auth"
</Auth>
OPTION "AUTH_FILE=/etc/apache2/dsa-guest-web-passwords"
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"
<Auth id="debian-apache-htpasswd">
URL "https://sso.debian.org/cgi-bin/dacs/local_apache_authenticate"
STYLE "pass"
@@
-23,8
+25,8
@@
OPTION "AUTH_FILE=/var/lib/misc/thishost/web-passwords"
OPTION "AUTH_MODULE=mod_auth"
</Auth>
OPTION "AUTH_FILE=/var/lib/misc/thishost/web-passwords"
OPTION "AUTH_MODULE=mod_auth"
</Auth>
+ -->
- <!-- Authenticate using an LDAP bind
<Auth id="ldap">
URL "https://sso.debian.org/cgi-bin/dacs/local_ldap_authenticate"
STYLE "password"
<Auth id="ldap">
URL "https://sso.debian.org/cgi-bin/dacs/local_ldap_authenticate"
STYLE "password"
@@
-38,6
+40,5
@@
ldap(dn_index, "${LDAP::attrvalue}", 1)), " ", "_") \
: 0'
</Auth>
ldap(dn_index, "${LDAP::attrvalue}", 1)), " ", "_") \
: 0'
</Auth>
- -->
</Jurisdiction>
</Configuration>
</Jurisdiction>
</Configuration>