From d089db0365bdecb9e25d997102043eafca4e7ec4 Mon Sep 17 00:00:00 2001
From: Paul-Henri Froidmont <git.contact-57n2p@froidmont.org>
Date: Wed, 28 Feb 2018 20:39:58 +0100
Subject: [PATCH] Disable collabora

---
 .../files/mailu/docker-compose.yml            |  2 +-
 .../files/nextcloud/docker-compose.yml        | 36 +++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/roles/mailu-docker/files/mailu/docker-compose.yml b/roles/mailu-docker/files/mailu/docker-compose.yml
index bd3ecdc..1047375 100644
--- a/roles/mailu-docker/files/mailu/docker-compose.yml
+++ b/roles/mailu-docker/files/mailu/docker-compose.yml
@@ -74,7 +74,7 @@ services:
     expose:
       - 80
     environment:
-      - VIRTUAL_HOST=mailu.banditlair.com
+      - VIRTUAL_HOST=mailu.banditlair.com,mail.banditlair.com
       - VIRTUAL_NETWORK=nginx-proxy
       - VIRTUAL_PORT=80
     volumes:
diff --git a/roles/nextcloud-docker/files/nextcloud/docker-compose.yml b/roles/nextcloud-docker/files/nextcloud/docker-compose.yml
index 3393146..ceb1097 100644
--- a/roles/nextcloud-docker/files/nextcloud/docker-compose.yml
+++ b/roles/nextcloud-docker/files/nextcloud/docker-compose.yml
@@ -59,21 +59,21 @@ services:
     image: redis
     restart: always
 
-  collabora:
-    image: collabora/code:3.0.0.4
-    cap_add:
-      - MKNOD
-    expose:
-      - 9980
-    environment:
-      - domain=${CLOUD_DOMAIN}
-      - VIRTUAL_HOST=${COLLABORA_DOMAIN}
-      - VIRTUAL_NETWORK=nginx-proxy
-      - VIRTUAL_PORT=9980
-      - VIRTUAL_PROTO=https
-      - LETSENCRYPT_HOST=${COLLABORA_DOMAIN}
-      - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL}
-    networks:
-      - proxy-tier
-      - default
-    restart: always
+#  collabora:
+#    image: collabora/code:3.0.0.4
+#    cap_add:
+#      - MKNOD
+#    expose:
+#      - 9980
+#    environment:
+#      - domain=${CLOUD_DOMAIN}
+#      - VIRTUAL_HOST=${COLLABORA_DOMAIN}
+#      - VIRTUAL_NETWORK=nginx-proxy
+#      - VIRTUAL_PORT=9980
+#      - VIRTUAL_PROTO=https
+#      - LETSENCRYPT_HOST=${COLLABORA_DOMAIN}
+#      - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL}
+#    networks:
+#      - proxy-tier
+#      - default
+#    restart: always