From fa016bf7d4007eedc072e36d75d646320f4f32e8 Mon Sep 17 00:00:00 2001 From: mserranom Date: Mon, 29 Jan 2024 12:46:02 +0100 Subject: [PATCH] Rebrand LDAP env variables to Overleaf GitOrigin-RevId: d0560a34a3ed0fb10fa2f5f3c0b41db7d7b10181 --- docker-compose.yml | 18 +++++++++--------- services/web/docker-compose.common.env | 18 +++++++++--------- services/web/local-dev.env | 2 +- services/web/local-test.env | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 40ca24e5ef..c9641457d5 100644 --- a/docker-compose.yml +++ b/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"}]' diff --git a/services/web/docker-compose.common.env b/services/web/docker-compose.common.env index 9e2e1ce26f..69ccd8c564 100644 --- a/services/web/docker-compose.common.env +++ b/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 diff --git a/services/web/local-dev.env b/services/web/local-dev.env index cfaead60f4..038a77bf01 100644 --- a/services/web/local-dev.env +++ b/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 diff --git a/services/web/local-test.env b/services/web/local-test.env index 30f0985480..1e29451d03 100644 --- a/services/web/local-test.env +++ b/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