Remove old hook (fixes: #1306)
This commit is contained in:
parent
8c23530293
commit
fc49c10a5d
8
Makefile
8
Makefile
|
@ -115,9 +115,9 @@ TESTWEBSERVER=apache
|
||||||
TESTWEBSERVERPORT=19876
|
TESTWEBSERVERPORT=19876
|
||||||
|
|
||||||
# LDAP backend test
|
# LDAP backend test
|
||||||
LLNGTESTLDAP_SLAPD_BIN:=/usr/sbin/slapd
|
LLNGTESTLDAP_SLAPD_BIN=/usr/sbin/slapd
|
||||||
LLNGTESTLDAP_SLAPADD_BIN:=/usr/sbin/slapdadd
|
LLNGTESTLDAP_SLAPADD_BIN=/usr/sbin/slapdadd
|
||||||
LLNGTESTLDAP_SCHEMA_DIR:=/etc/slapd/schema
|
LLNGTESTLDAP_SCHEMA_DIR=/etc/slapd/schema
|
||||||
|
|
||||||
# Other
|
# Other
|
||||||
SRCCOMMONDIR=lemonldap-ng-common
|
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'; \
|
addKey globalStorageOptions DataSource 'dbi:SQLite:dbname='`pwd`'/e2e-tests/conf/sessions.db'; \
|
||||||
fi
|
fi
|
||||||
@# Debian: make start_web_server TESTBACKEND=LDAP LLNGTESTLDAP_SCHEMA_DIR=/etc/ldap/schema LLNGTESTLDAP_SLAPADD_BIN=/usr/sbin/slapadd
|
@# 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/; \
|
cp lemonldap-ng-portal/t/testslapd/slapd.ldif e2e-tests/conf/; \
|
||||||
mkdir e2e-tests/conf/slapd.d; \
|
mkdir e2e-tests/conf/slapd.d; \
|
||||||
mkdir e2e-tests/conf/data; \
|
mkdir e2e-tests/conf/data; \
|
||||||
|
|
|
@ -245,12 +245,6 @@ sub setDefault {
|
||||||
delete $conf->{useXForwardedForIP};
|
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)
|
# Some parameters expect key name (example), not variable ($example)
|
||||||
if ( defined $conf->{whatToTrace} ) {
|
if ( defined $conf->{whatToTrace} ) {
|
||||||
$conf->{whatToTrace} =~ s/^\$//;
|
$conf->{whatToTrace} =~ s/^\$//;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user