Compare commits
2 Commits
6.7.0+v1.1
...
6.7.1+v1.1
| Author | SHA1 | Date | |
|---|---|---|---|
| 0cf9d0a244 | |||
| 86a44afd19 |
2
abra.sh
2
abra.sh
@ -5,7 +5,7 @@ export LOG_CONFIG_VERSION=v2
|
||||
export SHARED_SECRET_AUTH_VERSION=v2
|
||||
export SIGNAL_BRIDGE_YAML_VERSION=v6
|
||||
export TELEGRAM_BRIDGE_YAML_VERSION=v6
|
||||
export NGINX_CONFIG_VERSION=v8
|
||||
export NGINX_CONFIG_VERSION=v9
|
||||
export WK_SERVER_VERSION=v1
|
||||
export WK_CLIENT_VERSION=v1
|
||||
export PG_BACKUP_VERSION=v1
|
||||
|
||||
@ -104,7 +104,7 @@ services:
|
||||
restart_policy:
|
||||
condition: on-failure
|
||||
labels:
|
||||
- "coop-cloud.${STACK_NAME}.version=6.7.0+v1.133.0"
|
||||
- "coop-cloud.${STACK_NAME}.version=6.7.1+v1.133.0"
|
||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost:8008/health"]
|
||||
|
||||
@ -5,6 +5,16 @@ events {
|
||||
}
|
||||
|
||||
http {
|
||||
|
||||
resolver 127.0.0.11 valid=30s ipv6=off;
|
||||
resolver_timeout 5s;
|
||||
|
||||
upstream matrix_upstream {
|
||||
zone matrix_upstream 64k;
|
||||
server {{ env "STACK_NAME"}}_app:8008 resolve;
|
||||
keepalive 16;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
|
||||
@ -14,7 +24,7 @@ http {
|
||||
server_name {{ env "DOMAIN" }};
|
||||
|
||||
location = / {
|
||||
proxy_pass http://{{ env "STACK_NAME"}}_app:8008;
|
||||
proxy_pass http://matrix_upstream;
|
||||
proxy_set_header X-Forwarded-For $remote_addr;
|
||||
proxy_set_header X-Forwarded-Proto https;
|
||||
proxy_set_header Host $host;
|
||||
@ -23,7 +33,7 @@ http {
|
||||
}
|
||||
|
||||
location ~* ^(\/_matrix|\/_synapse\/client) {
|
||||
proxy_pass http://{{ env "STACK_NAME"}}_app:8008;
|
||||
proxy_pass http://matrix_upstream;
|
||||
proxy_set_header X-Forwarded-For $remote_addr;
|
||||
proxy_set_header X-Forwarded-Proto https;
|
||||
proxy_set_header Host $host;
|
||||
@ -42,7 +52,7 @@ http {
|
||||
if ($http_referer !~ "^https://{{ env "DOMAIN" }}/admin/") {
|
||||
return 403;
|
||||
}
|
||||
proxy_pass http://{{ env "STACK_NAME"}}_app:8008;
|
||||
proxy_pass http://matrix_upstream;
|
||||
proxy_set_header X-Forwarded-For $remote_addr;
|
||||
proxy_set_header X-Forwarded-Proto https;
|
||||
proxy_set_header Host $host;
|
||||
|
||||
1
release/6.7.1+v1.133.0
Normal file
1
release/6.7.1+v1.133.0
Normal file
@ -0,0 +1 @@
|
||||
This patch contains a critical nginx fix, to allow resolving docker internal hosts.
|
||||
Reference in New Issue
Block a user