- update to version 23.0.11
- remove collabora from docker-compose.yml - add restart policy for redis - add odoo.cooperative-oasis.org as allow from
This commit is contained in:
parent
9feb8f9f2b
commit
e49675de6b
|
@ -19,7 +19,7 @@ networks:
|
||||||
|
|
||||||
services:
|
services:
|
||||||
nextcloud-app:
|
nextcloud-app:
|
||||||
image: nextcloud-cron:23.0.9
|
image: nextcloud-cron:23.0.11
|
||||||
build: .
|
build: .
|
||||||
container_name: nextcloud-app
|
container_name: nextcloud-app
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
@ -55,6 +55,7 @@ services:
|
||||||
image: redis
|
image: redis
|
||||||
image: 'bitnami/redis:7.0.4'
|
image: 'bitnami/redis:7.0.4'
|
||||||
container_name: redis
|
container_name: redis
|
||||||
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
- "TZ=Europe/Paris"
|
- "TZ=Europe/Paris"
|
||||||
- ALLOW_EMPTY_PASSWORD=yes
|
- ALLOW_EMPTY_PASSWORD=yes
|
||||||
|
@ -75,34 +76,6 @@ services:
|
||||||
- "TZ=Europe/Paris"
|
- "TZ=Europe/Paris"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
#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:
|
onlyoffice:
|
||||||
container_name: onlyoffice
|
container_name: onlyoffice
|
||||||
image: onlyoffice_unlimited:7.2.1
|
image: onlyoffice_unlimited:7.2.1
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM nextcloud:23.0.9-apache
|
FROM nextcloud:23.0.11-apache
|
||||||
|
|
||||||
ARG VERSION
|
ARG VERSION
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
frameDeny = true
|
frameDeny = true
|
||||||
stsIncludeSubdomains = true
|
stsIncludeSubdomains = true
|
||||||
stsPreload = true
|
stsPreload = true
|
||||||
customFrameOptionsValue = "ALLOW-FROM https://code.oasis21.org https://cloud.oasis21.org"
|
customFrameOptionsValue = "ALLOW-FROM https://odoo.cooperative-oasis.org https://cloud.oasis21.org"
|
||||||
referrerPolicy = "same-origin"
|
referrerPolicy = "same-origin"
|
||||||
permissionsPolicy = "vibrate='self'"
|
permissionsPolicy = "vibrate='self'"
|
||||||
stsSeconds = 315360000
|
stsSeconds = 315360000
|
||||||
|
@ -27,8 +27,8 @@
|
||||||
excludedContentTypes = ["text/event-stream"]
|
excludedContentTypes = ["text/event-stream"]
|
||||||
|
|
||||||
[http.middlewares.allowFrameAndCORS.headers]
|
[http.middlewares.allowFrameAndCORS.headers]
|
||||||
customFrameOptionsValue = "ALLOW-FROM https://code.oasis21.org"
|
customFrameOptionsValue = "ALLOW-FROM https://code.oasis21.org https://odoo.cooperative-oasis.org"
|
||||||
contentSecurityPolicy = "frame-ancestors * cloud.oasis21.org"
|
contentSecurityPolicy = "frame-ancestors * cloud.oasis21.org https://odoo.cooperative-oasis.org"
|
||||||
accessControlAllowHeaders = ["*"]
|
accessControlAllowHeaders = ["*"]
|
||||||
accessControlAllowMethods = ["GET", "POST", "OPTIONS"]
|
accessControlAllowMethods = ["GET", "POST", "OPTIONS"]
|
||||||
accessControlAllowOriginList = ["*"]
|
accessControlAllowOriginList = ["*"]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user