From 41b35c8689a541599cbed4b0e92ff4e3c07f12da Mon Sep 17 00:00:00 2001
From: Richard Morgan <r_morgan@sympatico.ca>
Date: Fri, 2 Nov 2018 06:53:20 -0400
Subject: [PATCH] update sslproxy host for nextcloud add healthcheck to
 nextcloud containers.

---
 .../services/nextcloud/Dockerfile-mono        |  2 +-
 dockerfiles/services/nextcloud/deploy.sh      |  2 ++
 .../nextcloud/docker-compose-mono.yml         |  6 ++---
 .../nextcloud/docker-compose-prod.yml         | 22 +++++++++++++------
 .../sslproxy/hosts/xaibox.xai-corp.net.conf   |  7 +++++-
 5 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/dockerfiles/services/nextcloud/Dockerfile-mono b/dockerfiles/services/nextcloud/Dockerfile-mono
index a4b16f9..9c15f8b 100755
--- a/dockerfiles/services/nextcloud/Dockerfile-mono
+++ b/dockerfiles/services/nextcloud/Dockerfile-mono
@@ -1,4 +1,4 @@
-FROM nextcloud:13-apache
+FROM nextcloud:14-apache
 
 
 RUN apt-get update && apt-get install -y smbclient && rm -rf /var/lib/apt/lists/*
diff --git a/dockerfiles/services/nextcloud/deploy.sh b/dockerfiles/services/nextcloud/deploy.sh
index 95917e9..fb6d518 100644
--- a/dockerfiles/services/nextcloud/deploy.sh
+++ b/dockerfiles/services/nextcloud/deploy.sh
@@ -5,3 +5,5 @@ export DOCKER_HOST=dkmanager:2376
 docker login -u richard -p $DKREGISTRY_PASS $DKREGISTRY
 
 docker stack deploy --with-registry-auth --prune -c docker-compose-prod.yml xaibox
+
+docker service update -q xaibox_app
diff --git a/dockerfiles/services/nextcloud/docker-compose-mono.yml b/dockerfiles/services/nextcloud/docker-compose-mono.yml
index af3984f..eacf89a 100755
--- a/dockerfiles/services/nextcloud/docker-compose-mono.yml
+++ b/dockerfiles/services/nextcloud/docker-compose-mono.yml
@@ -2,8 +2,8 @@
 # docker-compose file for nextcloud server
 
 # docker login dkregistry.xai-corp.net:5000
-# docker-compose -f docker-compose-mono.yml build && docker push dkregistry.xai-corp.net:5000/xaicorp/nextcloud:latest
-# DOCKER_HOST=dkhost:2376 docker stack deploy --with-registry-auth -c docker-compose-prod.yml owncloud
+# docker-compose -f docker-compose-mono.yml build && docker push dkregistry.xai-corp.net:5000/xaicorp/nextcloud:14
+# DOCKER_HOST=dkhost:2376 docker stack deploy --with-registry-auth -c docker-compose-prod.yml xaibox
 
 version: '2'
 services:
@@ -12,4 +12,4 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile-mono
-    image: dkregistry.xai-corp.net:5000/xaicorp/nextcloud:13
+    image: dkregistry.xai-corp.net:5000/xaicorp/nextcloud:14
diff --git a/dockerfiles/services/nextcloud/docker-compose-prod.yml b/dockerfiles/services/nextcloud/docker-compose-prod.yml
index a56fab4..00b09d6 100755
--- a/dockerfiles/services/nextcloud/docker-compose-prod.yml
+++ b/dockerfiles/services/nextcloud/docker-compose-prod.yml
@@ -29,7 +29,15 @@ services:
       - DBPASS=xh891hx1hc89f239hibndnxc1i
       - REDISHOST=tasks.services_redis
       - REDISPORT=6379
-      - LOGLEVEL=3
+      - LOGLEVEL=0
+
+    healthcheck:
+      test: ["CMD", "curl", "-If", "http://localhost/status.php"]
+      interval: 1m30s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
+
     deploy:
       mode: replicated
       replicas: 1
@@ -51,12 +59,12 @@ services:
     - prod_db
     - prod_cache
 
-    logging:
-      driver: fluentd
-      options:
-        fluentd-address: "logs.xai-corp.net:24224"
-        fluentd-async-connect: 'true'
-        tag: nextcloud
+#    logging:
+#      driver: fluentd
+#      options:
+#        fluentd-address: "logs.xai-corp.net:24224"
+#        fluentd-async-connect: 'true'
+#        tag: nextcloud
 
 
 #  web:
diff --git a/dockerfiles/services/sslproxy/hosts/xaibox.xai-corp.net.conf b/dockerfiles/services/sslproxy/hosts/xaibox.xai-corp.net.conf
index 289ba7c..c104a22 100644
--- a/dockerfiles/services/sslproxy/hosts/xaibox.xai-corp.net.conf
+++ b/dockerfiles/services/sslproxy/hosts/xaibox.xai-corp.net.conf
@@ -21,7 +21,12 @@ server {
     add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always;
 
     location / {
-        proxy_set_header Connection $http_connection;
+        proxy_set_header        Connection $http_connection;
+        proxy_set_header        Host $host:$server_port;
+        proxy_set_header        X-Real-IP $remote_addr;
+        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header        X-Forwarded-Host $host;
+        proxy_set_header        X-Forwarded-Proto $scheme;
         proxy_pass http://xaibox_upstream;
     }