diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-10-31 20:29:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-31 20:29:30 +0200 |
| commit | 706436b63895996da29fc4c8a9ed37ee7683094c (patch) | |
| tree | cd7b68b223853153ad5ee31e0353ec2b2b7d891e | |
| parent | a06fd63690cff263fed903050ec188b3b787164a (diff) | |
| parent | 13aab4d410b0f7dc1105fc3a29a06831757584af (diff) | |
| download | wekan-706436b63895996da29fc4c8a9ed37ee7683094c.tar.gz wekan-706436b63895996da29fc4c8a9ed37ee7683094c.tar.bz2 wekan-706436b63895996da29fc4c8a9ed37ee7683094c.zip | |
Merge pull request #1980 from imkwx/devel
Fix typo about ldaps
| -rw-r--r-- | docker-compose-build.yml | 2 | ||||
| -rw-r--r-- | docker-compose.yml | 2 | ||||
| -rwxr-xr-x | snap-src/bin/config | 2 | ||||
| -rwxr-xr-x | snap-src/bin/wekan-help | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/docker-compose-build.yml b/docker-compose-build.yml index ceda447b..a9b573c4 100644 --- a/docker-compose-build.yml +++ b/docker-compose-build.yml @@ -141,7 +141,7 @@ services: # example : LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=true #- LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=false # LDAP_ENCRYPTION : If using LDAPS - # example : LDAP_ENCRYPTION=true + # example : LDAP_ENCRYPTION=ssl #- LDAP_ENCRYPTION=false # 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----- diff --git a/docker-compose.yml b/docker-compose.yml index 02a1a215..56ca7775 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -130,7 +130,7 @@ services: # example : LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=true #- LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=false # LDAP_ENCRYPTION : If using LDAPS - # example : LDAP_ENCRYPTION=true + # example : LDAP_ENCRYPTION=ssl #- LDAP_ENCRYPTION=false # 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----- diff --git a/snap-src/bin/config b/snap-src/bin/config index 7f829dc8..a19baf7d 100755 --- a/snap-src/bin/config +++ b/snap-src/bin/config @@ -178,7 +178,7 @@ DESCRIPTION_LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS="" DEFAULT_LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS="false" 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" KEY_LDAP_ENCRYPTION="ldap-encryption" diff --git a/snap-src/bin/wekan-help b/snap-src/bin/wekan-help index c8144f9a..c488a538 100755 --- a/snap-src/bin/wekan-help +++ b/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 "Ldap Encryption." 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 "Ldap Ca Cert." echo -e "The certification for the LDAPS server:" |