diff --git a/Makefile b/Makefile index 2feaa73..793a26f 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ CARTON ?= carton exec REAL_LUFI ?= script/application LUFI ?= script/lufi LDAP_CONTAINER_IMAGE ?= rroemhild/test-openldap:latest -LOCAL_LDAP_PORT ?= 389 +LOCAL_LDAP_PORT ?= 10389 LOCAL_SWIFT_PORT ?= 8080 SWIFT_CONTAINER_IMAGE ?= swiftstack/picoswiftstack:latest MORBO_HOST ?= 0.0.0.0 @@ -33,7 +33,7 @@ dev: clean $(CARTON) morbo $(LUFI) --listen http://$(MORBO_HOST):$(MORBO_PORT) --watch lib/ --watch script/ --watch themes/ --watch lufi.conf ldap: - sudo docker run --privileged -d -p $(LOCAL_LDAP_PORT):389 $(LDAP_CONTAINER_IMAGE); exit 0 + sudo docker run -d -p $(LOCAL_LDAP_PORT):10389 $(LDAP_CONTAINER_IMAGE); exit 0 ldapdev: ldap dev diff --git a/t/mysql.conf b/t/mysql.conf index 51a2d80..6abd3ec 100644 --- a/t/mysql.conf +++ b/t/mysql.conf @@ -220,7 +220,7 @@ # Set `ldap` if you want that only authenticated users can upload files # Please note that everybody can still download files # optional, no default - #ldap => { uri => 'ldap://rroemhild-test-openldap', user_tree => 'ou=people,dc=planetexpress,dc=com', bind_dn => 'cn=admin,dc=planetexpress,dc=com', bind_pwd => 'GoodNewsEveryone', user_attr => 'uid', user_filter => '' }, + #ldap => { uri => 'ldap://rroemhild-test-openldap:10389', user_tree => 'ou=people,dc=planetexpress,dc=com', bind_dn => 'cn=admin,dc=planetexpress,dc=com', bind_pwd => 'GoodNewsEveryone', user_attr => 'uid', user_filter => '' }, # If you've set ldap above, the session will last `session_duration` seconds before # the user needs to reauthenticate diff --git a/t/postgresql.conf b/t/postgresql.conf index 0ac7cfe..90c4964 100644 --- a/t/postgresql.conf +++ b/t/postgresql.conf @@ -205,7 +205,7 @@ # Set `ldap` if you want that only authenticated users can upload files # Please note that everybody can still download files # optional, no default - #ldap => { uri => 'ldap://rroemhild-test-openldap', user_tree => 'ou=people,dc=planetexpress,dc=com', bind_dn => 'cn=admin,dc=planetexpress,dc=com', bind_pwd => 'GoodNewsEveryone', user_attr => 'uid', user_filter => '' }, + #ldap => { uri => 'ldap://rroemhild-test-openldap:10389', user_tree => 'ou=people,dc=planetexpress,dc=com', bind_dn => 'cn=admin,dc=planetexpress,dc=com', bind_pwd => 'GoodNewsEveryone', user_attr => 'uid', user_filter => '' }, # If you've set ldap above, the session will last `session_duration` seconds before # the user needs to reauthenticate diff --git a/t/sqlite.conf b/t/sqlite.conf index bebca16..7e87e75 100644 --- a/t/sqlite.conf +++ b/t/sqlite.conf @@ -209,7 +209,7 @@ # Set `ldap` if you want that only authenticated users can upload files # Please note that everybody can still download files # optional, no default - #ldap => { uri => 'ldap://rroemhild-test-openldap', user_tree => 'ou=people,dc=planetexpress,dc=com', bind_dn => 'cn=admin,dc=planetexpress,dc=com', bind_pwd => 'GoodNewsEveryone', user_attr => 'uid', user_filter => '' }, + #ldap => { uri => 'ldap://rroemhild-test-openldap:10389', user_tree => 'ou=people,dc=planetexpress,dc=com', bind_dn => 'cn=admin,dc=planetexpress,dc=com', bind_pwd => 'GoodNewsEveryone', user_attr => 'uid', user_filter => '' }, # If you've set ldap above, the session will last `session_duration` seconds before # the user needs to reauthenticate