From f58c93cb498998e973e5683d1ac46f3b62efa3a0 Mon Sep 17 00:00:00 2001 From: Martin Ahrer Date: Mon, 14 May 2018 13:05:37 +0200 Subject: [PATCH] Configure /synchrony path for SSL --- README.adoc | 1 + docker-compose.yml | 3 --- proxy/nginx-ssl.template | 3 +++ proxy/nginx.template | 15 +++------------ server-ports.yml | 7 +++++++ 5 files changed, 14 insertions(+), 15 deletions(-) create mode 100644 server-ports.yml diff --git a/README.adoc b/README.adoc index 4b5a391..c897464 100644 --- a/README.adoc +++ b/README.adoc @@ -23,6 +23,7 @@ COMPOSE_FILE=docker-compose.yml:postgresdb.yml COMPOSE_HTTP_TIMEOUT=300 CONFLUENCE_HTTP_PORT=18090 +CONFLUENCE_SYNCHRONY_PORT=18091 CONFLUENCE_TAG=6.8.2 CONFLUENCE_JDBC_USER=*** CONFLUENCE_JDBC_PASSWORD=*** diff --git a/docker-compose.yml b/docker-compose.yml index 416b45c..4a11ff7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,9 +16,6 @@ services: - CONFLUENCE_LICENSE - CONFLUENCE_CONTEXT_PATH - NGINX_SERVER_NAME - ports: - - ${CONFLUENCE_HTTP_PORT}:8090 - - ${CONFLUENCE_SYNCHRONY_PORT}:8091 restart: unless-stopped stop_grace_period: 1m0s healthcheck: diff --git a/proxy/nginx-ssl.template b/proxy/nginx-ssl.template index 83288f8..80541c6 100644 --- a/proxy/nginx-ssl.template +++ b/proxy/nginx-ssl.template @@ -16,6 +16,9 @@ server { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_pass http://server:8090/${CONFLUENCE_CONTEXT_PATH}; client_max_body_size 50M; + proxy_connect_timeout 300; + proxy_send_timeout 300; + proxy_read_timeout 300; } } diff --git a/proxy/nginx.template b/proxy/nginx.template index 1b20b77..385fdd0 100644 --- a/proxy/nginx.template +++ b/proxy/nginx.template @@ -11,17 +11,8 @@ server { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_pass http://server:8090/${CONFLUENCE_CONTEXT_PATH}; client_max_body_size 50M; - proxy_connect_timeout 300; - proxy_send_timeout 300; - proxy_read_timeout 300; - } - location /synchrony { - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-Server $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://server:8091/synchrony; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; + proxy_connect_timeout 300; + proxy_send_timeout 300; + proxy_read_timeout 300; } } diff --git a/server-ports.yml b/server-ports.yml new file mode 100644 index 0000000..d153630 --- /dev/null +++ b/server-ports.yml @@ -0,0 +1,7 @@ +version: "2.2" + +services: + server: + ports: + - ${CONFLUENCE_HTTP_PORT}:8090 + - ${CONFLUENCE_SYNCHRONY_PORT}:8091