Explorar o código

LDAP: Fix USERDN example, when parameters contain spaces:
LDAP_AUTHENTIFICATION_USERDN="CN=ldap admin,CN=users,DC=domainmatter,DC=lan"

Thanks to compumatter !

Lauri Ojansivu %!s(int64=5) %!d(string=hai) anos
pai
achega
6cbd4cabc7
Modificáronse 4 ficheiros con 18 adicións e 5 borrados
  1. 4 2
      docker-compose.yml
  2. 3 2
      snap-src/bin/wekan-help
  3. 5 0
      start-wekan.bat
  4. 6 1
      start-wekan.sh

+ 4 - 2
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

+ 3 - 2
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:"

+ 5 - 0
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=

+ 6 - 1
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=