Configure /synchrony path for SSL

SoftwareCraftsmen · May 14, 2018 · da9e8de · da9e8de
1 parent 0ea1e6c
commit da9e8de
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 15 deletions.
diff --git 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=***
@@ -107,3 +108,8 @@ This requires a X.509 certificate subject to be configured.
 export X509_CERTIFICATE_SUBJECT="/C=AT/OU=Software Craftsmen Gmbh & CoKG/L=Vienna/[email protected]"
 docker-compose -f ssl-certificate.yml run generate-ssl-certificate
 ----
+
+== References
+
+https://confluence.atlassian.com/confeap/running-confluence-behind-nginx-with-ssl-849150880.html
+https://confluence.atlassian.com/confeap/administering-collaborative-editing-847355676.html
diff --git 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
@@ -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
@@ -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
@@ -0,0 +1,7 @@
+version: "2.2"
+
+services:
+  server:
+    ports:
+      - ${CONFLUENCE_HTTP_PORT}:8090
+      - ${CONFLUENCE_SYNCHRONY_PORT}:8091