projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ynic: use ftp.uk mirror temporarily
[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
2e39d01
..
3919598
100644
(file)
--- a/
modules/dacs/files/common/dacs.conf
+++ b/
modules/dacs/files/common/dacs.conf
@@
-4,7
+4,7
@@
FEDERATION_DOMAIN "debian.org"
FEDERATION_NAME "DEBIANORG"
EVAL ${Conf::JURISDICTION_AUTHSERVER}="sso.debian.org"
FEDERATION_DOMAIN "debian.org"
FEDERATION_NAME "DEBIANORG"
EVAL ${Conf::JURISDICTION_AUTHSERVER}="sso.debian.org"
- LOG_LEVEL "
info
"
+ LOG_LEVEL "
notice
"
</Default>
<Jurisdiction uri="*.debian.org">
JURISDICTION_NAME "DEBIAN"
</Default>
<Jurisdiction uri="*.debian.org">
JURISDICTION_NAME "DEBIAN"
@@
-17,7
+17,6
@@
OPTION "AUTH_MODULE=mod_auth"
</Auth>
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"
@@
-25,8
+24,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>
- -->
+<!--
<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"
@@
-40,5
+39,6
@@
ldap(dn_index, "${LDAP::attrvalue}", 1)), " ", "_") \
: 0'
</Auth>
ldap(dn_index, "${LDAP::attrvalue}", 1)), " ", "_") \
: 0'
</Auth>
+ -->
</Jurisdiction>
</Configuration>
</Jurisdiction>
</Configuration>