Ver código fonte

Rebrand LDAP env variables to Overleaf

GitOrigin-RevId: d0560a34a3ed0fb10fa2f5f3c0b41db7d7b10181
mserranom 2 anos atrás
pai
commit
fa016bf7d4

+ 9 - 9
docker-compose.yml

@@ -88,15 +88,15 @@ services:
             # DOCKER_RUNNER: 'false'
 
             ## Works with test LDAP server shown at bottom of docker compose
-            # SHARELATEX_LDAP_URL: 'ldap://ldap:389'
-            # SHARELATEX_LDAP_SEARCH_BASE: 'ou=people,dc=planetexpress,dc=com'
-            # SHARELATEX_LDAP_SEARCH_FILTER: '(uid={{username}})'
-            # SHARELATEX_LDAP_BIND_DN: 'cn=admin,dc=planetexpress,dc=com'
-            # SHARELATEX_LDAP_BIND_CREDENTIALS: 'GoodNewsEveryone'
-            # SHARELATEX_LDAP_EMAIL_ATT: 'mail'
-            # SHARELATEX_LDAP_NAME_ATT: 'cn'
-            # SHARELATEX_LDAP_LAST_NAME_ATT: 'sn'
-            # SHARELATEX_LDAP_UPDATE_USER_DETAILS_ON_LOGIN: 'true'
+            # OVERLEAF_LDAP_URL: 'ldap://ldap:389'
+            # OVERLEAF_LDAP_SEARCH_BASE: 'ou=people,dc=planetexpress,dc=com'
+            # OVERLEAF_LDAP_SEARCH_FILTER: '(uid={{username}})'
+            # OVERLEAF_LDAP_BIND_DN: 'cn=admin,dc=planetexpress,dc=com'
+            # OVERLEAF_LDAP_BIND_CREDENTIALS: 'GoodNewsEveryone'
+            # OVERLEAF_LDAP_EMAIL_ATT: 'mail'
+            # OVERLEAF_LDAP_NAME_ATT: 'cn'
+            # OVERLEAF_LDAP_LAST_NAME_ATT: 'sn'
+            # OVERLEAF_LDAP_UPDATE_USER_DETAILS_ON_LOGIN: 'true'
 
             # OVERLEAF_TEMPLATES_USER_ID: "578773160210479700917ee5"
             # OVERLEAF_NEW_PROJECT_TEMPLATE_LINKS: '[ {"name":"All Templates","url":"/templates/all"}]'

+ 9 - 9
services/web/docker-compose.common.env

@@ -19,15 +19,15 @@ OT_JWT_AUTH_KEY="very secret key"
 EXTERNAL_AUTH=none
 RECAPTCHA_ENDPOINT=http://localhost:2222/recaptcha/api/siteverify
 # Server-Pro LDAP
-SHARELATEX_LDAP_URL=ldap://ldap:389
-SHARELATEX_LDAP_SEARCH_BASE=ou=people,dc=planetexpress,dc=com
-SHARELATEX_LDAP_SEARCH_FILTER="(uid={{username}})"
-SHARELATEX_LDAP_BIND_DN=cn=admin,dc=planetexpress,dc=com
-SHARELATEX_LDAP_BIND_CREDENTIALS=GoodNewsEveryone
-SHARELATEX_LDAP_EMAIL_ATT=mail
-SHARELATEX_LDAP_NAME_ATT=cn
-SHARELATEX_LDAP_LAST_NAME_ATT=sn
-SHARELATEX_LDAP_UPDATE_USER_DETAILS_ON_LOGIN=true
+OVERLEAF_LDAP_URL=ldap://ldap:389
+OVERLEAF_LDAP_SEARCH_BASE=ou=people,dc=planetexpress,dc=com
+OVERLEAF_LDAP_SEARCH_FILTER="(uid={{username}})"
+OVERLEAF_LDAP_BIND_DN=cn=admin,dc=planetexpress,dc=com
+OVERLEAF_LDAP_BIND_CREDENTIALS=GoodNewsEveryone
+OVERLEAF_LDAP_EMAIL_ATT=mail
+OVERLEAF_LDAP_NAME_ATT=cn
+OVERLEAF_LDAP_LAST_NAME_ATT=sn
+OVERLEAF_LDAP_UPDATE_USER_DETAILS_ON_LOGIN=true
 # Server-Pro SAML
 SHARELATEX_SAML_ENTRYPOINT=http://saml/simplesaml/saml2/idp/SSOService.php
 SHARELATEX_SAML_CALLBACK_URL=http://saml/saml/callback

+ 1 - 1
services/web/local-dev.env

@@ -7,7 +7,7 @@ RATELIMITER_REDIS_HOST=127.0.0.1
 GCLOUD_2_REDIS_HOST=127.0.0.1
 POSTGRES_HOST=127.0.0.1
 MONGO_URL=mongodb://127.0.0.1/sharelatex?directConnection=true
-SHARELATEX_LDAP_URL=ldap://127.0.0.1:22389
+OVERLEAF_LDAP_URL=ldap://127.0.0.1:22389
 SAML_BASE_URL_PATH=http://127.0.0.1:22280/simplesaml/
 SHARELATEX_SAML_ENTRYPOINT=http://127.0.0.1:22280/simplesaml/saml2/idp/SSOService.php
 SHARELATEX_SAML_CALLBACK_URL=http://www.dev-overleaf.com/saml/callback

+ 1 - 1
services/web/local-test.env

@@ -8,7 +8,7 @@ RATELIMITER_REDIS_HOST=127.0.0.1
 GCLOUD_2_REDIS_HOST=127.0.0.1
 POSTGRES_HOST=127.0.0.1
 MONGO_URL=mongodb://127.0.0.1/test-overleaf?directConnection=true
-SHARELATEX_LDAP_URL=ldap://127.0.0.1:22389
+OVERLEAF_LDAP_URL=ldap://127.0.0.1:22389
 SAML_BASE_URL_PATH=http://127.0.0.1:22280/simplesaml/
 SHARELATEX_SAML_ENTRYPOINT=http://127.0.0.1:22280/simplesaml/saml2/idp/SSOService.php
 SHARELATEX_SAML_CALLBACK_URL=http://127.0.0.1:22280/saml/callback