Selaa lähdekoodia

Fix typo about ldaps

Documentation said to set LDAP_ENCRYPTION to true if we want to use
ldaps, but the code in wekan-ldap does not check if it is set to true,
but if the value equals to 'ssl' instead.
Robin BRUCKER 6 vuotta sitten
vanhempi
sitoutus
13aab4d410
4 muutettua tiedostoa jossa 4 lisäystä ja 4 poistoa
  1. 1 1
      docker-compose-build.yml
  2. 1 1
      docker-compose.yml
  3. 1 1
      snap-src/bin/config
  4. 1 1
      snap-src/bin/wekan-help

+ 1 - 1
docker-compose-build.yml

@@ -141,7 +141,7 @@ services:
       # example : LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=true
       # example : LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=true
       #- LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=false
       #- LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=false
       # LDAP_ENCRYPTION : If using LDAPS
       # LDAP_ENCRYPTION : If using LDAPS
-      # example : LDAP_ENCRYPTION=true
+      # example : LDAP_ENCRYPTION=ssl
       #- LDAP_ENCRYPTION=false
       #- LDAP_ENCRYPTION=false
       # LDAP_CA_CERT : The certification for the LDAPS server. Certificate needs to be included in this docker-compose.yml file.
       # LDAP_CA_CERT : The certification for the LDAPS server. Certificate needs to be included in this docker-compose.yml file.
       # example : LDAP_CA_CERT=-----BEGIN CERTIFICATE-----MIIE+zCCA+OgAwIBAgIkAhwR/6TVLmdRY6hHxvUFWc0+Enmu/Hu6cj+G2FIdAgIC...-----END CERTIFICATE-----
       # example : LDAP_CA_CERT=-----BEGIN CERTIFICATE-----MIIE+zCCA+OgAwIBAgIkAhwR/6TVLmdRY6hHxvUFWc0+Enmu/Hu6cj+G2FIdAgIC...-----END CERTIFICATE-----

+ 1 - 1
docker-compose.yml

@@ -130,7 +130,7 @@ services:
       # example : LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=true
       # example : LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=true
       #- LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=false
       #- LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=false
       # LDAP_ENCRYPTION : If using LDAPS
       # LDAP_ENCRYPTION : If using LDAPS
-      # example : LDAP_ENCRYPTION=true
+      # example : LDAP_ENCRYPTION=ssl
       #- LDAP_ENCRYPTION=false
       #- LDAP_ENCRYPTION=false
       # LDAP_CA_CERT : The certification for the LDAPS server. Certificate needs to be included in this docker-compose.yml file.
       # LDAP_CA_CERT : The certification for the LDAPS server. Certificate needs to be included in this docker-compose.yml file.
       # example : LDAP_CA_CERT=-----BEGIN CERTIFICATE-----MIIE+zCCA+OgAwIBAgIkAhwR/6TVLmdRY6hHxvUFWc0+Enmu/Hu6cj+G2FIdAgIC...-----END CERTIFICATE-----
       # example : LDAP_CA_CERT=-----BEGIN CERTIFICATE-----MIIE+zCCA+OgAwIBAgIkAhwR/6TVLmdRY6hHxvUFWc0+Enmu/Hu6cj+G2FIdAgIC...-----END CERTIFICATE-----

+ 1 - 1
snap-src/bin/config

@@ -178,7 +178,7 @@ DESCRIPTION_LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=""
 DEFAULT_LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS="false"
 DEFAULT_LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS="false"
 KEY_LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS="ldap-background-sync-import-new-users"
 KEY_LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS="ldap-background-sync-import-new-users"
 
 
-DESCRIPTION_LDAP_ENCRYPTION="If using LDAPS"
+DESCRIPTION_LDAP_ENCRYPTION="If using LDAPS, use LDAP_ENCRYPTION=ssl"
 DEFAULT_LDAP_ENCRYPTION="false"
 DEFAULT_LDAP_ENCRYPTION="false"
 KEY_LDAP_ENCRYPTION="ldap-encryption"
 KEY_LDAP_ENCRYPTION="ldap-encryption"
 
 

+ 1 - 1
snap-src/bin/wekan-help

@@ -165,7 +165,7 @@ echo -e "\t$ snap set $SNAP_NAME LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS='true'"
 echo -e "\n"
 echo -e "\n"
 echo -e "Ldap Encryption."
 echo -e "Ldap Encryption."
 echo -e "Allow LDAPS:"
 echo -e "Allow LDAPS:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_ENCRYPTION='true'"
+echo -e "\t$ snap set $SNAP_NAME LDAP_ENCRYPTION='ssl'"
 echo -e "\n"
 echo -e "\n"
 echo -e "Ldap Ca Cert."
 echo -e "Ldap Ca Cert."
 echo -e "The certification for the LDAPS server:"
 echo -e "The certification for the LDAPS server:"