parent
6fe14edef7
commit
951fc56434
4
abra.sh
4
abra.sh
|
@ -1,11 +1,11 @@
|
||||||
export DISCORD_BRIDGE_YAML_VERSION=v2
|
export DISCORD_BRIDGE_YAML_VERSION=v2
|
||||||
export ENTRYPOINT_CONF_VERSION=v2
|
export ENTRYPOINT_CONF_VERSION=v2
|
||||||
export HOMESERVER_YAML_VERSION=v27
|
export HOMESERVER_YAML_VERSION=v28
|
||||||
export LOG_CONFIG_VERSION=v2
|
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=v5
|
export NGINX_CONFIG_VERSION=v6
|
||||||
export WK_SERVER_VERSION=v1
|
export WK_SERVER_VERSION=v1
|
||||||
export WK_CLIENT_VERSION=v1
|
export WK_CLIENT_VERSION=v1
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
version: "3.8"
|
version: "3.8"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
synapse:
|
app:
|
||||||
environment:
|
environment:
|
||||||
- APP_SERVICES_ENABLED
|
- APP_SERVICES_ENABLED
|
||||||
- APP_SERVICE_CONFIGS
|
- APP_SERVICE_CONFIGS
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
version: "3.8"
|
version: "3.8"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
synapse:
|
app:
|
||||||
secrets:
|
secrets:
|
||||||
- db_password
|
- db_password
|
||||||
- form_secret
|
- form_secret
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
version: "3.8"
|
version: "3.8"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
synapse:
|
app:
|
||||||
secrets:
|
secrets:
|
||||||
- keycloak2_client_secret
|
- keycloak2_client_secret
|
||||||
environment:
|
environment:
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
version: "3.8"
|
version: "3.8"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
synapse:
|
app:
|
||||||
secrets:
|
secrets:
|
||||||
- keycloak3_client_secret
|
- keycloak3_client_secret
|
||||||
environment:
|
environment:
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
version: "3.8"
|
version: "3.8"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
synapse:
|
app:
|
||||||
environment:
|
environment:
|
||||||
- SHARED_SECRET_AUTH_ENABLED
|
- SHARED_SECRET_AUTH_ENABLED
|
||||||
secrets:
|
secrets:
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
version: "3.8"
|
version: "3.8"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
synapse:
|
app:
|
||||||
environment:
|
environment:
|
||||||
- APP_SERVICES_ENABLED
|
- APP_SERVICES_ENABLED
|
||||||
- APP_SERVICE_CONFIGS
|
- APP_SERVICE_CONFIGS
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
version: "3.8"
|
version: "3.8"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
synapse:
|
app:
|
||||||
secrets:
|
secrets:
|
||||||
- db_password
|
- db_password
|
||||||
- form_secret
|
- form_secret
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
version: "3.8"
|
version: "3.8"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
synapse:
|
app:
|
||||||
environment:
|
environment:
|
||||||
- APP_SERVICES_ENABLED
|
- APP_SERVICES_ENABLED
|
||||||
- APP_SERVICE_CONFIGS
|
- APP_SERVICE_CONFIGS
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
version: "3.8"
|
version: "3.8"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
synapse:
|
app:
|
||||||
secrets:
|
secrets:
|
||||||
- db_password
|
- db_password
|
||||||
- form_secret
|
- form_secret
|
||||||
|
|
15
compose.yml
15
compose.yml
|
@ -2,12 +2,13 @@
|
||||||
version: "3.8"
|
version: "3.8"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
web:
|
||||||
image: nginx:1.25.3
|
image: nginx:1.25.3
|
||||||
networks:
|
networks:
|
||||||
- proxy
|
- proxy
|
||||||
- internal
|
- internal
|
||||||
environment:
|
environment:
|
||||||
|
- DOMAIN
|
||||||
- STACK_NAME
|
- STACK_NAME
|
||||||
- NGINX_ACCESS_LOG_LOCATION
|
- NGINX_ACCESS_LOG_LOCATION
|
||||||
- NGINX_ERROR_LOG_LOCATION
|
- NGINX_ERROR_LOG_LOCATION
|
||||||
|
@ -27,15 +28,13 @@ 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.5+v1.100.0"
|
|
||||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: curl -f http://synapse:8008/health || exit 1
|
test: curl -f http://${STACK_NAME}_app:8008/health || exit 1
|
||||||
interval: 5s
|
interval: 5s
|
||||||
timeout: 3s
|
timeout: 3s
|
||||||
retries: 20
|
retries: 20
|
||||||
|
|
||||||
synapse:
|
app:
|
||||||
image: "matrixdotorg/synapse:v1.100.0"
|
image: "matrixdotorg/synapse:v1.100.0"
|
||||||
volumes:
|
volumes:
|
||||||
- "data:/data"
|
- "data:/data"
|
||||||
|
@ -87,6 +86,12 @@ services:
|
||||||
- source: entrypoint_conf
|
- source: entrypoint_conf
|
||||||
target: /docker-entrypoint.sh
|
target: /docker-entrypoint.sh
|
||||||
mode: 0555
|
mode: 0555
|
||||||
|
deploy:
|
||||||
|
restart_policy:
|
||||||
|
condition: on-failure
|
||||||
|
labels:
|
||||||
|
- "coop-cloud.${STACK_NAME}.version=5.0.6+v1.100.0"
|
||||||
|
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:8008/health"]
|
test: ["CMD", "curl", "-f", "http://localhost:8008/health"]
|
||||||
interval: 30s
|
interval: 30s
|
||||||
|
|
|
@ -23,7 +23,7 @@ serve_server_wellknown: {{ env "SERVE_SERVER_WELLKNOWN" }}
|
||||||
allow_public_rooms_without_auth: false
|
allow_public_rooms_without_auth: false
|
||||||
|
|
||||||
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#allow_public_rooms_over_federation
|
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#allow_public_rooms_over_federation
|
||||||
allow_public_rooms_over_federation: {{ env "ALLOW_PUBLIC_ROOMS_FEDERATION" }}
|
allow_public_rooms_over_federation: {{ or (env "ALLOW_PUBLIC_ROOMS_FEDERATION") "true" }}
|
||||||
|
|
||||||
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#listeners
|
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#listeners
|
||||||
listeners:
|
listeners:
|
||||||
|
|
|
@ -8,13 +8,13 @@ http {
|
||||||
server {
|
server {
|
||||||
listen 80;
|
listen 80;
|
||||||
|
|
||||||
access_log {{ env "NGINX_ACCESS_LOG_LOCATION" }};
|
access_log {{ or (env "NGINX_ACCESS_LOG_LOCATION") "/dev/null" }};
|
||||||
error_log {{ env "NGINX_ERROR_LOG_LOCATION" }};
|
error_log {{ or (env "NGINX_ERROR_LOG_LOCATION") "/dev/null" }};
|
||||||
|
|
||||||
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"}}_app:8008;
|
||||||
proxy_set_header X-Forwarded-For $remote_addr;
|
proxy_set_header X-Forwarded-For $remote_addr;
|
||||||
proxy_set_header X-Forwarded-Proto https;
|
proxy_set_header X-Forwarded-Proto https;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $host;
|
||||||
|
|
Loading…
Reference in New Issue