From 0dd2cc1e599b2cc427e410dc9aafca00cde5e1c3 Mon Sep 17 00:00:00 2001
From: "Alexey.Golubev" <alexey.golubev@onlyoffice.com>
Date: Tue, 12 Jul 2016 15:07:52 +0300
Subject: [PATCH 1/5] use http proxy instead of tcp proxy.

---
 docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 0d73142..f2a3a79 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,6 +34,7 @@ services:
       - onlyoffice-redis
       - onlyoffice-rabbitmq
     environment:
+      - VIRTUAL_HOST="ws://\*/doc/*"
       - HTTP_CHECK=HEAD /healthcheck
       - EXTRA_SETTINGS=http-check expect status 200
     stdin_open: true
@@ -53,8 +54,7 @@ services:
     depends_on:
       - onlyoffice-documentserver
     environment:
-      - MODE=tcp
-      - TCP_PORTS="80, 443"
+      - MODE=http
     stdin_open: true
     tty: true
     links:

From 795548735253d5fe49f5626a8d94e928a3a06209 Mon Sep 17 00:00:00 2001
From: "Alexey.Golubev" <alexey.golubev@onlyoffice.com>
Date: Tue, 12 Jul 2016 15:37:09 +0300
Subject: [PATCH 2/5] Added uri balanced type.

---
 docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index f2a3a79..6421404 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,6 +35,7 @@ services:
       - onlyoffice-rabbitmq
     environment:
       - VIRTUAL_HOST="ws://\*/doc/*"
+      - BALANCE=uri depth 3
       - HTTP_CHECK=HEAD /healthcheck
       - EXTRA_SETTINGS=http-check expect status 200
     stdin_open: true

From ad64cea8ec39b6a8091c9f0fad87416250504589 Mon Sep 17 00:00:00 2001
From: Alexey Golubev <alexey.golubev@onlyoffice.com>
Date: Tue, 12 Jul 2016 17:27:04 +0300
Subject: [PATCH 3/5] removed unused code

---
 run-document-server.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/run-document-server.sh b/run-document-server.sh
index 901ad09..adfd639 100644
--- a/run-document-server.sh
+++ b/run-document-server.sh
@@ -100,8 +100,6 @@ start_nginx(){
   if [ -f "${SSL_CERTIFICATE_PATH}" -a -f "${SSL_KEY_PATH}" ]; then
     cp ${SYSCONF_TEMPLATES_DIR}/nginx/onlyoffice-documentserver-ssl.conf ${NGINX_ONLYOFFICE_PATH}
 
-    mkdir ${DATA_DIR}
-
     # configure nginx
     sed 's,{{SSL_CERTIFICATE_PATH}},'"${SSL_CERTIFICATE_PATH}"',' -i ${NGINX_ONLYOFFICE_PATH}
     sed 's,{{SSL_KEY_PATH}},'"${SSL_KEY_PATH}"',' -i ${NGINX_ONLYOFFICE_PATH}
@@ -186,4 +184,4 @@ if [ ${ONLYOFFICE_DATA_CONTAINER} != "true" ]; then
 fi
 
 # Regenerate the fonts list and the fonts thumbnails
-documentserver-generate-allfonts.sh ${ONLYOFFICE_DATA_CONTAINER}
\ No newline at end of file
+documentserver-generate-allfonts.sh ${ONLYOFFICE_DATA_CONTAINER}

From a81303683010e9dbe891923f3b942dac4dcc9e1f Mon Sep 17 00:00:00 2001
From: Alexey Golubev <Alexey.Golubev@onlyoffice.com>
Date: Fri, 15 Jul 2016 16:31:53 +0300
Subject: [PATCH 4/5] Updated haproxy container, removed virtual host, added
 templates for ssl

---
 docker-compose.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 6421404..4d1f8cf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,10 +34,11 @@ services:
       - onlyoffice-redis
       - onlyoffice-rabbitmq
     environment:
-      - VIRTUAL_HOST="ws://\*/doc/*"
       - BALANCE=uri depth 3
       - HTTP_CHECK=HEAD /healthcheck
       - EXTRA_SETTINGS=http-check expect status 200
+      # Uncomment the string below to redirect HTTP request to HTTPS request.
+      #- FORCE_SSL=true
     stdin_open: true
     tty: true
     restart: always
@@ -45,23 +46,27 @@ services:
       - onlyoffice
     expose:
       - '80'
-      - '443'
     volumes_from:
      - onlyoffice-documentserver-data
 
   onlyoffice-haproxy:
     container_name: onlyoffice-haproxy
-    image: dockercloud/haproxy:1.2.1
+    image: dockercloud/haproxy:1.5.1
     depends_on:
       - onlyoffice-documentserver
     environment:
       - MODE=http
+      # Uncomment the string below to specify the path of ssl certificates
+      #- CERT_FOLDER=/certs/
     stdin_open: true
     tty: true
     links:
      - onlyoffice-documentserver
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
+      # Uncomment the string below to map a ssl certificate from host
+      # to the proxy container
+      #- /app/onlyoffice/DocumentServer/data/certs/onlyoffice.pem:/certs/cert1.pem
     restart: always
     networks:
      - onlyoffice

From dd27f00a62310d9c442fd983ea5ff2ea764b5979 Mon Sep 17 00:00:00 2001
From: Alexey Golubev <Alexey.Golubev@onlyoffice.com>
Date: Fri, 15 Jul 2016 17:14:18 +0300
Subject: [PATCH 5/5] Seach for the string "true" in a http body when
 healthcheack service

---
 docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4d1f8cf..df2ba7a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,8 +35,8 @@ services:
       - onlyoffice-rabbitmq
     environment:
       - BALANCE=uri depth 3
-      - HTTP_CHECK=HEAD /healthcheck
-      - EXTRA_SETTINGS=http-check expect status 200
+      - HTTP_CHECK=GET /healthcheck
+      - EXTRA_SETTINGS=http-check expect string true
       # Uncomment the string below to redirect HTTP request to HTTPS request.
       #- FORCE_SSL=true
     stdin_open: true