From 030e91a3659bf579b56fc57457c133b4eb9c4d75 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 18 Jul 2016 16:08:33 +0100 Subject: [PATCH 1/2] Update docker-compose.yml --- docker-compose.yml | 51 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 67525765b2..ca6dd4f532 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,54 @@ services: environment: SHARELATEX_MONGO_URL: mongodb://mongo/sharelatex SHARELATEX_REDIS_HOST: redis - SHARELATEX_APP_NAME: 'ShareLaTeX' + SHARELATEX_APP_NAME: 'Our ShareLaTeX' + + # SHARELATEX_SITE_URL: "http://sharelatex.mydomain.com" + # SHARELATEX_NAV_TITLE: "Our ShareLaTeX Instance" + # SHARELATEX_HEADER_IMAGE_URL: "http://somewhere.com/mylogo.png" + # SHARELATEX_ADMIN_EMAIL: "support@it.com" + + # SHARELATEX_LEFT_FOOTER: '[{"text": "Powered by ShareLaTeX 2016"},{"text": "Another page I want to link to can be found here"} ]' + # SHARELATEX_RIGHT_FOOTER: '[{"text": "Hello I am on the Right"} ]' + + # SHARELATEX_EMAIL_FROM_ADDRESS: "team@sharelatex.com" + + # SHARELATEX_EMAIL_AWS_SES_ACCESS_KEY_ID: "" + # SHARELATEX_EMAIL_AWS_SES_SECRET_KEY: "" + + # SHARELATEX_EMAIL_SMTP_HOST: "smtp.mydomain.com" + # SHARELATEX_EMAIL_SMTP_PORT: 587 + # SHARELATEX_EMAIL_SMTP_SECURE: 'false' + # SHARELATEX_EMAIL_SMTP_USER: "" + # SHARELATEX_EMAIL_SMTP_PASS: "" + # SHARELATEX_EMAIL_SMTP_TLS_REJECT_UNAUTH: 'true' + # SHARELATEX_EMAIL_SMTP_IGNORE_TLS: 'false' + # SHARELATEX_CUSTOM_EMAIL_FOOTER:"
This system is run by department x
" + + ################ + ## Server Pro ## + ################ + + # SANDBOXED_COMPILES: "true" + + # SHARELATEX_LDAP_HOST: 'ldap://ldap.forumsys.com' + # SHARELATEX_LDAP_DN: 'uid=:userKey,dc=example,dc=com' + # SHARELATEX_LDAP_BASE_SEARCH: 'dc=example,dc=com' + # SHARELATEX_LDAP_FILTER: '(uid=:userKey)' + # SHARELATEX_LDAP_ADMIN_DN: 'cn=read-only-admin,dc=example,dc=com' + # SHARELATEX_LDAP_ADMIN_PW: password' + # SHARELATEX_LDAP_ANONYMOUS: "false" + # SHARELATEX_LDAP_EMAIL_ATT: "mail" + # SHARELATEX_LDAP_NAME_ATT: "name" + # SHARELATEX_LDAP_LAST_NAME_ATT: "secondname" + # SHARELATEX_LDAP_PLACEHOLDER: "Username" + # SHARELATEX_LDAP_TLS: "true" + # SHARELATEX_LDAP_TLS_OPTS_REJECT_UNAUTH: + # SHARELATEX_LDAP_TLS_OPTS_CA_PATH: '["/var/one.pem", "/var/two.pem"]' + + # SHARELATEX_TEMPLATES_USER_ID: "578773160210479700917ee5" + + # SHARELATEX_PROXY_LEARN: "true" mongo: restart: always @@ -36,4 +83,4 @@ services: expose: - 6379 volumes: - - ~/redis_data:/data \ No newline at end of file + - ~/redis_data:/data From f0c2723f21efb40d680a4f33063a389ad5fc5e3d Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 18 Jul 2016 16:11:04 +0100 Subject: [PATCH 2/2] Update docker-compose.yml --- docker-compose.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index ca6dd4f532..07db7756a9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,6 +19,9 @@ services: SHARELATEX_MONGO_URL: mongodb://mongo/sharelatex SHARELATEX_REDIS_HOST: redis SHARELATEX_APP_NAME: 'Our ShareLaTeX' + + #Set for SSL via nginx-proxy + #VIRTUAL_HOST: 103.112.212.22 # SHARELATEX_SITE_URL: "http://sharelatex.mydomain.com" # SHARELATEX_NAV_TITLE: "Our ShareLaTeX Instance" @@ -84,3 +87,13 @@ services: - 6379 volumes: - ~/redis_data:/data + +# nginx-proxy: +# image: jwilder/nginx-proxy +# container_name: nginx-proxy +# ports: +# #- "80:80" +# - "443:443" +# volumes: +# - /var/run/docker.sock:/tmp/docker.sock:ro +# - /home/sharelatex/tmp:/etc/nginx/certs