Skip to content

Commit

Permalink
Configure /synchrony path for SSL
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Ahrer committed May 14, 2018
1 parent 0ea1e6c commit f58c93c
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 15 deletions.
1 change: 1 addition & 0 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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=***
Expand Down
3 changes: 0 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions proxy/nginx-ssl.template
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down
15 changes: 3 additions & 12 deletions proxy/nginx.template
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
7 changes: 7 additions & 0 deletions server-ports.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: "2.2"

services:
server:
ports:
- ${CONFLUENCE_HTTP_PORT}:8090
- ${CONFLUENCE_SYNCHRONY_PORT}:8091

0 comments on commit f58c93c

Please sign in to comment.