Compare commits
4 Commits
5.0.1+v1.9
...
5.0.3+v1.1
Author | SHA1 | Date | |
---|---|---|---|
d4ccb3588b | |||
11f70b7878 | |||
fd601c23f3 | |||
b9097c1f94 |
@ -42,6 +42,13 @@ PASSWORD_LOGIN_ENABLED=true
|
|||||||
SQL_LOG_LEVEL=WARN
|
SQL_LOG_LEVEL=WARN
|
||||||
ROOT_LOG_LEVEL=WARN
|
ROOT_LOG_LEVEL=WARN
|
||||||
|
|
||||||
|
# for nginx
|
||||||
|
NGINX_ACCESS_LOG_LOCATION="/dev/null"
|
||||||
|
NGINX_ERROR_LOG_LOCATION="/dev/null"
|
||||||
|
# Comment the previous two lines and uncomment these to enable logging
|
||||||
|
#NGINX_ACCESS_LOG_LOCATION="/dev/stdout"
|
||||||
|
#NGINX_ERROR_LOG_LOCATION="/dev/stderr"
|
||||||
|
|
||||||
## Privacy
|
## Privacy
|
||||||
|
|
||||||
ENABLE_3PID_LOOKUP=true
|
ENABLE_3PID_LOOKUP=true
|
||||||
|
2
abra.sh
2
abra.sh
@ -5,7 +5,7 @@ export LOG_CONFIG_VERSION=v2
|
|||||||
export SHARED_SECRET_AUTH_VERSION=v1
|
export SHARED_SECRET_AUTH_VERSION=v1
|
||||||
export SIGNAL_BRIDGE_YAML_VERSION=v4
|
export SIGNAL_BRIDGE_YAML_VERSION=v4
|
||||||
export TELEGRAM_BRIDGE_YAML_VERSION=v6
|
export TELEGRAM_BRIDGE_YAML_VERSION=v6
|
||||||
export NGINX_CONFIG_VERSION=v4
|
export NGINX_CONFIG_VERSION=v5
|
||||||
export WK_SERVER_VERSION=v1
|
export WK_SERVER_VERSION=v1
|
||||||
export WK_CLIENT_VERSION=v1
|
export WK_CLIENT_VERSION=v1
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ services:
|
|||||||
- telegram-data:/telegram-data
|
- telegram-data:/telegram-data
|
||||||
|
|
||||||
telegrambridge:
|
telegrambridge:
|
||||||
image: dock.mau.dev/mautrix/telegram:v0.14.2
|
image: dock.mau.dev/mautrix/telegram:v0.15.1
|
||||||
depends_on:
|
depends_on:
|
||||||
- telegramdb
|
- telegramdb
|
||||||
configs:
|
configs:
|
||||||
|
@ -3,12 +3,14 @@ version: "3.8"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: nginx:1.23.3
|
image: nginx:1.25.3
|
||||||
networks:
|
networks:
|
||||||
- proxy
|
- proxy
|
||||||
- internal
|
- internal
|
||||||
environment:
|
environment:
|
||||||
- STACK_NAME
|
- STACK_NAME
|
||||||
|
- NGINX_ACCESS_LOG_LOCATION
|
||||||
|
- NGINX_ERROR_LOG_LOCATION
|
||||||
configs:
|
configs:
|
||||||
- source: nginx_config
|
- source: nginx_config
|
||||||
target: /etc/nginx/nginx.conf
|
target: /etc/nginx/nginx.conf
|
||||||
@ -25,7 +27,7 @@ services:
|
|||||||
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
|
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
|
||||||
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
||||||
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||||
- "coop-cloud.${STACK_NAME}.version=5.0.0+v1.93.0"
|
- "coop-cloud.${STACK_NAME}.version=5.0.3+v1.100.0"
|
||||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: curl -f http://synapse:8008/health || exit 1
|
test: curl -f http://synapse:8008/health || exit 1
|
||||||
@ -34,7 +36,7 @@ services:
|
|||||||
retries: 20
|
retries: 20
|
||||||
|
|
||||||
synapse:
|
synapse:
|
||||||
image: "matrixdotorg/synapse:v1.93.0"
|
image: "matrixdotorg/synapse:v1.100.0"
|
||||||
volumes:
|
volumes:
|
||||||
- "data:/data"
|
- "data:/data"
|
||||||
secrets:
|
secrets:
|
||||||
|
@ -8,15 +8,15 @@ http {
|
|||||||
server {
|
server {
|
||||||
listen 80;
|
listen 80;
|
||||||
|
|
||||||
access_log off;
|
access_log {{ env "NGINX_ACCESS_LOG_LOCATION" }};
|
||||||
error_log /dev/null;
|
error_log {{ env "NGINX_ERROR_LOG_LOCATION" }};
|
||||||
|
|
||||||
server_name {{ env "DOMAIN" }};
|
server_name {{ env "DOMAIN" }};
|
||||||
|
|
||||||
location ~* ^(\/_matrix|\/_synapse\/client) {
|
location ~* ^(\/_matrix|\/_synapse\/client) {
|
||||||
proxy_pass http://{{ env "STACK_NAME"}}_synapse:8008;
|
proxy_pass http://{{ env "STACK_NAME"}}_synapse:8008;
|
||||||
proxy_set_header X-Forwarded-For $remote_addr;
|
proxy_set_header X-Forwarded-For $remote_addr;
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
proxy_set_header X-Forwarded-Proto https;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $host;
|
||||||
client_max_body_size 50M;
|
client_max_body_size 50M;
|
||||||
proxy_http_version 1.1;
|
proxy_http_version 1.1;
|
||||||
|
8
release/5.0.1+v1.93.0
Normal file
8
release/5.0.1+v1.93.0
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
take care when upgrading! You need to add two variables to your .env file:
|
||||||
|
use the following if you don't want any access logs (including users' IP addresses):
|
||||||
|
NGINX_ACCESS_LOG_LOCATION="/dev/null"
|
||||||
|
NGINX_ERROR_LOG_LOCATION="/dev/null"
|
||||||
|
|
||||||
|
use the following if you want logs:
|
||||||
|
NGINX_ACCESS_LOG_LOCATION="/dev/stdout"
|
||||||
|
NGINX_ERROR_LOG_LOCATION="/dev/stderr"
|
Reference in New Issue
Block a user