summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2019-09-06 01:22:15 +0300
committerLauri Ojansivu <x@xet7.org>2019-09-06 01:22:15 +0300
commit6cbd4cabc716c755e547abb798f657fe5476ed04 (patch)
treeb136d61df824ed8ece763729d2524d0529f496f8
parent10b953041fa812a306caa9aa200bbff5f4b20483 (diff)
downloadwekan-6cbd4cabc716c755e547abb798f657fe5476ed04.tar.gz
wekan-6cbd4cabc716c755e547abb798f657fe5476ed04.tar.bz2
wekan-6cbd4cabc716c755e547abb798f657fe5476ed04.zip
LDAP: Fix USERDN example, when parameters contain spaces:
LDAP_AUTHENTIFICATION_USERDN="CN=ldap admin,CN=users,DC=domainmatter,DC=lan" Thanks to compumatter !
-rw-r--r--docker-compose.yml6
-rwxr-xr-xsnap-src/bin/wekan-help5
-rwxr-xr-xstart-wekan.bat5
-rwxr-xr-xstart-wekan.sh7
4 files changed, 18 insertions, 5 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index 9b950b5b..7fbe9f32 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -426,8 +426,10 @@ services:
# If the LDAP needs a user account to search
#- LDAP_AUTHENTIFICATION=true
#
- # The search user DN
- #- LDAP_AUTHENTIFICATION_USERDN=cn=wekan_adm,ou=serviceaccounts,ou=admin,ou=prod,dc=mydomain,dc=com
+ # The search user DN - You need quotes when you have spaces in parameters
+ # 2 examples:
+ #- LDAP_AUTHENTIFICATION_USERDN="CN=ldap admin,CN=users,DC=domainmatter,DC=lan"
+ #- LDAP_AUTHENTIFICATION_USERDN="CN=wekan_adm,OU=serviceaccounts,OU=admin,OU=prod,DC=mydomain,DC=com"
#
# The password for the search user
#- LDAP_AUTHENTIFICATION_PASSWORD=pwd
diff --git a/snap-src/bin/wekan-help b/snap-src/bin/wekan-help
index f1e8ce28..cde3dd57 100755
--- a/snap-src/bin/wekan-help
+++ b/snap-src/bin/wekan-help
@@ -281,8 +281,9 @@ echo -e "If the LDAP needs a user account to search:"
echo -e "\t$ snap set $SNAP_NAME ldap-authentication='true'"
echo -e "\n"
echo -e "Ldap Authentication User Dn."
-echo -e "The search user Dn:"
-echo -e "\t$ snap set $SNAP_NAME ldap-authentication-userdn='cn=admin,dc=example,dc=org'"
+echo -e "The search user Dn, 2 examples:"
+echo -e "\t$ snap set $SNAP_NAME ldap-authentication-userdn='CN=ldap admin,CN=users,DC=domainmatter,DC=lan'"
+echo -e "\t$ snap set $SNAP_NAME ldap-authentication-userdn='CN=wekan_adm,OU=serviceaccounts,OU=admin,OU=prod,DC=mydomain,DC=com'"
echo -e "\n"
echo -e "Ldap Authentication Password."
echo -e "The password for the search user:"
diff --git a/start-wekan.bat b/start-wekan.bat
index 063c752a..bc0f4130 100755
--- a/start-wekan.bat
+++ b/start-wekan.bat
@@ -206,6 +206,11 @@ REM # LDAP_AUTHENTIFICATION_USERDN : The search user DN
REM # example: LDAP_AUTHENTIFICATION_USERDN=cn=admin,dc=example,dc=org
REM SET LDAP_AUTHENTIFICATION_USERDN=
+REM # The search user DN - You need quotes when you have spaces in parameters
+REM # 2 examples:
+REM SET LDAP_AUTHENTIFICATION_USERDN="CN=ldap admin,CN=users,DC=domainmatter,DC=lan"
+REM SET LDAP_AUTHENTIFICATION_USERDN="CN=wekan_adm,OU=serviceaccounts,OU=admin,OU=prod,DC=mydomain,DC=com"
+
REM # LDAP_AUTHENTIFICATION_PASSWORD : The password for the search user
REM # example : AUTHENTIFICATION_PASSWORD=admin
REM SET LDAP_AUTHENTIFICATION_PASSWORD=
diff --git a/start-wekan.sh b/start-wekan.sh
index 5c319311..1c89ad88 100755
--- a/start-wekan.sh
+++ b/start-wekan.sh
@@ -218,7 +218,12 @@
#export LDAP_AUTHENTIFICATION=false
# LDAP_AUTHENTIFICATION_USERDN : The search user DN
# example : export LDAP_AUTHENTIFICATION_USERDN=cn=admin,dc=example,dc=org
- #export LDAP_AUTHENTIFICATION_USERDN=
+ #----------------------------------------------------------------------------
+ # The search user DN - You need quotes when you have spaces in parameters
+ # 2 examples:
+ #export LDAP_AUTHENTIFICATION_USERDN="CN=ldap admin,CN=users,DC=domainmatter,DC=lan"
+ #export LDAP_AUTHENTIFICATION_USERDN="CN=wekan_adm,OU=serviceaccounts,OU=admin,OU=prod,DC=mydomain,DC=com"
+ #---------------------------------------------------------------------------
# LDAP_AUTHENTIFICATION_PASSWORD : The password for the search user
# example : AUTHENTIFICATION_PASSWORD=admin
#export LDAP_AUTHENTIFICATION_PASSWORD=