Commit fc49c10a authored by Xavier Guimard's avatar Xavier Guimard

Remove old hook (fixes: #1306)

parent 8c235302
......@@ -115,9 +115,9 @@ TESTWEBSERVER=apache
TESTWEBSERVERPORT=19876
# LDAP backend test
LLNGTESTLDAP_SLAPD_BIN:=/usr/sbin/slapd
LLNGTESTLDAP_SLAPADD_BIN:=/usr/sbin/slapdadd
LLNGTESTLDAP_SCHEMA_DIR:=/etc/slapd/schema
LLNGTESTLDAP_SLAPD_BIN=/usr/sbin/slapd
LLNGTESTLDAP_SLAPADD_BIN=/usr/sbin/slapdadd
LLNGTESTLDAP_SCHEMA_DIR=/etc/slapd/schema
# Other
SRCCOMMONDIR=lemonldap-ng-common
......@@ -430,7 +430,7 @@ start_web_server: all prepare_test_server
addKey globalStorageOptions DataSource 'dbi:SQLite:dbname='`pwd`'/e2e-tests/conf/sessions.db'; \
fi
@# Debian: make start_web_server TESTBACKEND=LDAP LLNGTESTLDAP_SCHEMA_DIR=/etc/ldap/schema LLNGTESTLDAP_SLAPADD_BIN=/usr/sbin/slapadd
@if test "$(TESTBACKEND)" = "LDAP"; then \
if test "$(TESTBACKEND)" = "LDAP"; then \
cp lemonldap-ng-portal/t/testslapd/slapd.ldif e2e-tests/conf/; \
mkdir e2e-tests/conf/slapd.d; \
mkdir e2e-tests/conf/data; \
......
......@@ -245,12 +245,6 @@ sub setDefault {
delete $conf->{useXForwardedForIP};
}
# Force Choice backend
if ( $conf->{authentication} eq "Choice" ) {
$conf->{userDB} = "Choice";
$conf->{passwordDB} = "Choice";
}
# Some parameters expect key name (example), not variable ($example)
if ( defined $conf->{whatToTrace} ) {
$conf->{whatToTrace} =~ s/^\$//;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment