From e49675de6b57cabed459cffe3c501e8803135840 Mon Sep 17 00:00:00 2001
From: root <root@services.oasis21.org>
Date: Sun, 6 Nov 2022 12:30:46 +0100
Subject: [PATCH] - 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

---
 nextcloud/docker-compose.yml | 31 ++-----------------------------
 nextcloud/dockerfile         |  2 +-
 traefik/traefik_dynamic.toml |  6 +++---
 3 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index c5622ff..d1ebd17 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -19,7 +19,7 @@ networks:
 
 services:
   nextcloud-app:
-    image: nextcloud-cron:23.0.9
+    image: nextcloud-cron:23.0.11
     build: .
     container_name: nextcloud-app
     restart: unless-stopped
@@ -55,6 +55,7 @@ services:
     image: redis
     image: 'bitnami/redis:7.0.4'
     container_name: redis
+    restart: unless-stopped
     environment:
       - "TZ=Europe/Paris"
       - ALLOW_EMPTY_PASSWORD=yes
@@ -75,34 +76,6 @@ services:
       - "TZ=Europe/Paris"
     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:
     container_name: onlyoffice
     image: onlyoffice_unlimited:7.2.1
diff --git a/nextcloud/dockerfile b/nextcloud/dockerfile
index f00565d..eef2244 100644
--- a/nextcloud/dockerfile
+++ b/nextcloud/dockerfile
@@ -1,4 +1,4 @@
-FROM nextcloud:23.0.9-apache
+FROM nextcloud:23.0.11-apache
 
 ARG VERSION
 
diff --git a/traefik/traefik_dynamic.toml b/traefik/traefik_dynamic.toml
index 48d357c..eee543e 100644
--- a/traefik/traefik_dynamic.toml
+++ b/traefik/traefik_dynamic.toml
@@ -18,7 +18,7 @@
     frameDeny = true
     stsIncludeSubdomains = 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"
     permissionsPolicy = "vibrate='self'"
     stsSeconds = 315360000
@@ -27,8 +27,8 @@
     excludedContentTypes = ["text/event-stream"]
 
   [http.middlewares.allowFrameAndCORS.headers]
-    customFrameOptionsValue = "ALLOW-FROM https://code.oasis21.org"
-    contentSecurityPolicy = "frame-ancestors * cloud.oasis21.org"
+    customFrameOptionsValue = "ALLOW-FROM https://code.oasis21.org https://odoo.cooperative-oasis.org"
+    contentSecurityPolicy = "frame-ancestors * cloud.oasis21.org https://odoo.cooperative-oasis.org"
     accessControlAllowHeaders = ["*"]
     accessControlAllowMethods = ["GET", "POST", "OPTIONS"]
     accessControlAllowOriginList = ["*"]