Commit a99e70f3 authored by yzx9's avatar yzx9
Browse files

Bump sharelatex to v4.1.1 

- bump sharelatex
- init mongodb replset
- format docker-compose.yml
parent c4775c7d

docker-compose.certbot.yml

+156 −141
Original line number Diff line number Diff line 
version: '2.2'

version: "2.2"

services:

  sharelatex:

    restart: always
@@ -36,7 +36,7 @@ services: 
      # SHARELATEX_EMAIL_AWS_SES_SECRET_KEY:

      SHARELATEX_EMAIL_SMTP_HOST: smtp.${MYDOMAIN}

      SHARELATEX_EMAIL_SMTP_PORT: 587

            SHARELATEX_EMAIL_SMTP_SECURE: 'false'

      SHARELATEX_EMAIL_SMTP_SECURE: "false"

      # SHARELATEX_EMAIL_SMTP_USER:

      # SHARELATEX_EMAIL_SMTP_PASS:

      # SHARELATEX_EMAIL_SMTP_TLS_REJECT_UNAUTH: true
@@ -48,11 +48,11 @@ services: 
      # https://github.com/overleaf/overleaf/issues/628

      # https://github.com/overleaf/web/issues/367

      # Fixed in 2.0.2 (Release date: 2019-11-26)

            SHARELATEX_ALLOW_PUBLIC_ACCESS: 'true' 

            SHARELATEX_ALLOW_ANONYMOUS_READ_AND_WRITE_SHARING: 'true'

      SHARELATEX_ALLOW_PUBLIC_ACCESS: "true"

      SHARELATEX_ALLOW_ANONYMOUS_READ_AND_WRITE_SHARING: "true"



            SHARELATEX_SECURE_COOKIE: 'true'

            SHARELATEX_BEHIND_PROXY: 'true'

      SHARELATEX_SECURE_COOKIE: "true"

      SHARELATEX_BEHIND_PROXY: "true"



      LDAP_SERVER: ldaps://LDAPSERVER:636

      LDAP_BASE: ou=people,dc=DOMAIN,dc=TLD
@@ -68,18 +68,18 @@ services: 
      # LDAP_BIND_PW:



      # Only allow users matching LDAP_USER_FILTER

            LDAP_USER_FILTER: '(memberof=cn=GROUPNAME,ou=groups,dc=DOMAIN,dc=TLD)'

      LDAP_USER_FILTER: "(memberof=cn=GROUPNAME,ou=groups,dc=DOMAIN,dc=TLD)"



      # If user is in ADMIN_GROUP on user creation (first login) isAdmin is set to true.

      # Admin Users can invite external (non ldap) users. This feature makes only sense

      # when ALLOW_EMAIL_LOGIN is set to 'true'. Additionally admins can send

      # system wide messages.

            LDAP_ADMIN_GROUP_FILTER: '(memberof=cn=ADMINGROUPNAME,ou=groups,dc=DOMAIN,dc=TLD)'

            ALLOW_EMAIL_LOGIN: 'true'

      LDAP_ADMIN_GROUP_FILTER: "(memberof=cn=ADMINGROUPNAME,ou=groups,dc=DOMAIN,dc=TLD)"

      ALLOW_EMAIL_LOGIN: "true"



      # All users in the LDAP_CONTACT_FILTER are loaded from the ldap server into contacts.

            LDAP_CONTACT_FILTER: '(memberof=cn=GROUPNAME,ou=groups,dc=DOMAIN,dc=TLD)'

            LDAP_CONTACTS: 'false'

      LDAP_CONTACT_FILTER: "(memberof=cn=GROUPNAME,ou=groups,dc=DOMAIN,dc=TLD)"

      LDAP_CONTACTS: "false"



      # Same property, unfortunately with different names in

      # different locations
@@ -87,10 +87,10 @@ services: 
      REDIS_HOST: redis

      REDIS_PORT: 6379



            ENABLED_LINKED_FILE_TYPES: 'url,project_file'

      ENABLED_LINKED_FILE_TYPES: "url,project_file"



      # Enables Thumbnail generation using ImageMagick

            ENABLE_CONVERSIONS: 'true'

      ENABLE_CONVERSIONS: "true"



  mongo:

    restart: always
@@ -105,6 +105,24 @@ services: 
      interval: 10s

      timeout: 10s

      retries: 5

    command: "--replSet overleaf"



  # See also: https://github.com/overleaf/overleaf/issues/1120

  mongoinit:

    image: mongo:4.4

    # this container will exit after executing the command

    restart: "no"

    depends_on:

      mongo:

        condition: service_healthy

    entrypoint:

      [

        "mongo",

        "--host",

        "mongo:27017",

        "--eval",

        'rs.initiate({ _id: "overleaf", members: [ { _id: 0, host: "mongo:27017" } ] })',

      ]



  redis:

    restart: always
@@ -120,7 +138,6 @@ services: 
      timeout: 5s

      retries: 5





  simple-certbot:

    restart: always

    image: certbot/certbot
@@ -138,5 +155,3 @@ services: 
        trap exit TERM;\

        certbot certonly --standalone -d ${MYDOMAIN} --agree-tos -m ${MYMAIL} -n ; \

        while :; do certbot renew; sleep 240h & wait $${!}; done;

docker-compose.traefik.yml

+238 −221
Original line number Diff line number Diff line 
version: '2.2'

version: "2.2"

services:

  traefik:

    image: traefik:latest
@@ -118,7 +118,7 @@ services: 
      SHARELATEX_EMAIL_FROM_ADDRESS: "noreply@${MYDOMAIN}"

      SHARELATEX_EMAIL_SMTP_HOST: smtp.${MYDOMAIN}

      SHARELATEX_EMAIL_SMTP_PORT: 587

            SHARELATEX_EMAIL_SMTP_SECURE: 'false'

      SHARELATEX_EMAIL_SMTP_SECURE: "false"

      # SHARELATEX_EMAIL_SMTP_USER:

      # SHARELATEX_EMAIL_SMTP_PASS:

      # SHARELATEX_EMAIL_SMTP_TLS_REJECT_UNAUTH: true
@@ -130,11 +130,11 @@ services: 
      # https://github.com/overleaf/overleaf/issues/628

      # https://github.com/overleaf/web/issues/367

      # Fixed in 2.0.2 (Release date: 2019-11-26)

            SHARELATEX_ALLOW_PUBLIC_ACCESS: 'true' 

            SHARELATEX_ALLOW_ANONYMOUS_READ_AND_WRITE_SHARING: 'true'

      SHARELATEX_ALLOW_PUBLIC_ACCESS: "true"

      SHARELATEX_ALLOW_ANONYMOUS_READ_AND_WRITE_SHARING: "true"



            SHARELATEX_SECURE_COOKIE: 'true'

            SHARELATEX_BEHIND_PROXY: 'true'

      SHARELATEX_SECURE_COOKIE: "true"

      SHARELATEX_BEHIND_PROXY: "true"



      LDAP_SERVER: ldaps://LDAPSERVER:636

      LDAP_BASE: ou=people,dc=DOMAIN,dc=TLD
@@ -150,18 +150,18 @@ services: 
      # LDAP_BIND_PW:



      # Only allow users matching LDAP_USER_FILTER

            LDAP_USER_FILTER: '(memberof=cn=GROUPNAME,ou=groups,dc=DOMAIN,dc=TLD)'

      LDAP_USER_FILTER: "(memberof=cn=GROUPNAME,ou=groups,dc=DOMAIN,dc=TLD)"



      # If user is in ADMIN_GROUP on user creation (first login) isAdmin is set to true.

      # Admin Users can invite external (non ldap) users. This feature makes only sense

      # when ALLOW_EMAIL_LOGIN is set to 'true'. Additionally admins can send

      # system wide messages.

            LDAP_ADMIN_GROUP_FILTER: '(memberof=cn=ADMINGROUPNAME,ou=groups,dc=DOMAIN,dc=TLD)'

            ALLOW_EMAIL_LOGIN: 'true'

      LDAP_ADMIN_GROUP_FILTER: "(memberof=cn=ADMINGROUPNAME,ou=groups,dc=DOMAIN,dc=TLD)"

      ALLOW_EMAIL_LOGIN: "true"



      # All users in the LDAP_CONTACT_FILTER are loaded from the ldap server into contacts.

            LDAP_CONTACT_FILTER: '(memberof=cn=GROUPNAME,ou=groups,dc=DOMAIN,dc=TLD)'

            LDAP_CONTACTS: 'false'

      LDAP_CONTACT_FILTER: "(memberof=cn=GROUPNAME,ou=groups,dc=DOMAIN,dc=TLD)"

      LDAP_CONTACTS: "false"



      # Same property, unfortunately with different names in

      # different locations
@@ -169,10 +169,10 @@ services: 
      REDIS_HOST: redis

      REDIS_PORT: 6379



            ENABLED_LINKED_FILE_TYPES: 'url,project_file'

      ENABLED_LINKED_FILE_TYPES: "url,project_file"



      # Enables Thumbnail generation using ImageMagick

            ENABLE_CONVERSIONS: 'true'

      ENABLE_CONVERSIONS: "true"



  mongo:

    restart: always
@@ -195,6 +195,24 @@ services: 
      - "traefik.tcp.routers.mongodb.entrypoints=mongo"

    networks:

      - web

    command: "--replSet overleaf"



  # See also: https://github.com/overleaf/overleaf/issues/1120

  mongoinit:

    image: mongo:4.4

    # this container will exit after executing the command

    restart: "no"

    depends_on:

      mongo:

        condition: service_healthy

    entrypoint:

      [

        "mongo",

        "--host",

        "mongo:27017",

        "--eval",

        'rs.initiate({ _id: "overleaf", members: [ { _id: 0, host: "mongo:27017" } ] })',

      ]



  redis:

    restart: always
@@ -223,4 +241,3 @@ services: 
networks:

  web:

    external: true

ldap-overleaf-sl/Dockerfile

+1 −1
Original line number Diff line number Diff line 
FROM sharelatex/sharelatex:4.0.5

FROM sharelatex/sharelatex:4.1.1

# FROM sharelatex/sharelatex:latest

# latest might not be tested 

# e.g. the AuthenticationManager.js script had to be adapted after versions 2.3.1

CRA Git | Maintained and supported by SUSTech CRA and CCSE