diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index ebd6af7..a6dc12b 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -7,6 +7,10 @@ volumes: name: docker_nextcloud nextcloud: name: docker_nextcloud-conf + onlyoffice-data: + name: docker_onlyoffice-data +# onlyoffice-log: +# name: docker_onlyoffice-log networks: nextcloud: @@ -20,7 +24,7 @@ services: container_name: nextcloud-app restart: unless-stopped extra_hosts : - code.oasis21.org : 172.16.7.10 + office.oasis21.org : 172.16.7.10 volumes: - nextcloud:/var/www/html - nextcloud-data:/var/www/html/data @@ -71,29 +75,52 @@ services: - "TZ=Europe/Paris" restart: unless-stopped - collabora: - image: collabora/code:22.05.3.1.1 - container_name: collabora + #collabora: + # image: collabora/code:22.05.3.1.1 + # container_name: collabora + # extra_hosts : + # cloud.oasis21.org : 172.16.7.10 + # environment: + # - "TZ=Europe/Paris" + # - aliasgroup1=cloud.oasis21.org + # - DONT_GEN_SSL_CERT=1 + # - serveur_name=code.oasis21.org + # - "extra_params=--o:ssl.enable=false --o:ssl.termination=true" + # networks: + # - nextcloud + # - proxy + # env_file: ./secrets/librezo.secrets + # cap_add: + # - MKNOD + # restart: + # unless-stopped + # labels: + # traefik.http.routers.collabora.entrypoints: websecure + # traefik.http.routers.collabora.rule: Host(`code.oasis21.org`) + # traefik.http.services.collabora.loadbalancer.server.port: 9980 + # traefik.http.routers.collabora.middlewares: allowFrameAndCORS@file + # traefik.enable: true + + + + onlyoffice: + container_name: onlyoffice + image: onlyoffice/documentserver:7.1.1.23 + restart: unless-stopped extra_hosts : - cloud.oasis21.org : 172.16.7.10 + cloud.oasis21.org : 172.16.7.11 environment: - - "TZ=Europe/Paris" - - aliasgroup1=cloud.oasis21.org - - DONT_GEN_SSL_CERT=1 - - serveur_name=code.oasis21.org - - "extra_params=--o:ssl.enable=false --o:ssl.termination=true" - networks: + - JWT_ENABLED=false + volumes: + - onlyoffice-data:/var/www/onlyoffice/Data + #- onlyoffice-log:/var/log/onlyoffice + labels: + traefik.http.routers.onlyoffice.entrypoints: websecure + traefik.http.routers.onlyoffice.rule: Host(`office.oasis21.org`) + traefik.http.services.onlyoffice.loadbalancer.server.port: 80 + traefik.enable: true + traefik.http.routers.onlyoffice.middlewares: allowFrameAndCORS@file, onlyoffice-sslheaders + traefik.http.middlewares.onlyoffice-sslheaders.headers.customrequestheaders.X-Forwarded-Proto: "https" + networks: - nextcloud - proxy - env_file: ./secrets/librezo.secrets - cap_add: - - MKNOD - restart: - unless-stopped - labels: - traefik.http.routers.collabora.entrypoints: websecure - traefik.http.routers.collabora.rule: Host(`code.oasis21.org`) - traefik.http.services.collabora.loadbalancer.server.port: 9980 - traefik.http.routers.collabora.middlewares: allowFrameAndCORS@file - traefik.enable: true -