Compare commits
6 Commits
6.0.2+v1.1
...
6.1.2+v1.1
Author | SHA1 | Date | |
---|---|---|---|
6bd2f0b779 | |||
e2bec9e4b4 | |||
da95b5c70d | |||
f13856b14c | |||
2c8dc7c960 | |||
c36c147dff |
@ -167,3 +167,6 @@ RETENTION_MAX_LIFETIME=4w
|
||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.shared_secret_auth.yml"
|
||||
#SHARED_SECRET_AUTH_ENABLED=1
|
||||
#SECRET_SHARED_SECRET_AUTH_VERSION=v1 # length=128
|
||||
|
||||
## Web Client (Redirect)
|
||||
#WEB_CLIENT_LOCATION=https://element-web.example.com
|
||||
|
@ -24,6 +24,10 @@
|
||||
|
||||
## Tips & Tricks
|
||||
|
||||
### Create User
|
||||
|
||||
`register_new_matrix_user -u <username> -k $(cat /var/run/secrets/registration) -p <password>`
|
||||
|
||||
### Set Admin User
|
||||
|
||||
`abra app cmd YOURAPPDOMAIN db set_admin <adminuser>`
|
||||
|
4
abra.sh
4
abra.sh
@ -1,11 +1,11 @@
|
||||
export DISCORD_BRIDGE_YAML_VERSION=v2
|
||||
export ENTRYPOINT_CONF_VERSION=v2
|
||||
export HOMESERVER_YAML_VERSION=v28
|
||||
export HOMESERVER_YAML_VERSION=v29
|
||||
export LOG_CONFIG_VERSION=v2
|
||||
export SHARED_SECRET_AUTH_VERSION=v1
|
||||
export SIGNAL_BRIDGE_YAML_VERSION=v4
|
||||
export TELEGRAM_BRIDGE_YAML_VERSION=v6
|
||||
export NGINX_CONFIG_VERSION=v6
|
||||
export NGINX_CONFIG_VERSION=v7
|
||||
export WK_SERVER_VERSION=v1
|
||||
export WK_CLIENT_VERSION=v1
|
||||
|
||||
|
15
alaconnect.yml
Normal file
15
alaconnect.yml
Normal file
@ -0,0 +1,15 @@
|
||||
authentik:
|
||||
env:
|
||||
KEYCLOAK_ID: authentik
|
||||
KEYCLOAK_NAME: sso
|
||||
KEYCLOAK_URL: https://authentik.example.com/application/o/matrix/
|
||||
KEYCLOAK_CLIENT_DOMAIN: https://element-web.example.com
|
||||
KEYCLOAK_ALLOW_EXISTING_USERS: "true"
|
||||
KEYCLOAK_CLIENT_ID: matrix
|
||||
uncomment:
|
||||
- compose.keycloak.yml
|
||||
- KEYCLOAK_ENABLED
|
||||
- KEYCLOAK_CLIENT_ID
|
||||
- SECRET_KEYCLOAK_CLIENT_SECRET_VERSION
|
||||
shared_secrets:
|
||||
matrix_secret: keycloak_client_secret
|
@ -3,7 +3,7 @@ version: "3.8"
|
||||
|
||||
services:
|
||||
web:
|
||||
image: nginx:1.25.3
|
||||
image: nginx:1.27.1
|
||||
networks:
|
||||
- proxy
|
||||
- internal
|
||||
@ -35,7 +35,7 @@ services:
|
||||
retries: 20
|
||||
|
||||
app:
|
||||
image: "matrixdotorg/synapse:v1.100.0"
|
||||
image: "matrixdotorg/synapse:v1.111.0"
|
||||
volumes:
|
||||
- "data:/data"
|
||||
secrets:
|
||||
@ -75,6 +75,7 @@ services:
|
||||
- LOGIN_LIMIT_IP_BURST=${LOGIN_LIMIT_IP_BURST:-5}
|
||||
- LOGIN_LIMIT_ACCOUNT_PER_SECOND=${LOGIN_LIMIT_ACCOUNT_PER_SECOND:-0.003}
|
||||
- LOGIN_LIMIT_ACCOUNT_BURST=${LOGIN_LIMIT_ACCOUNT_BURST:-5}
|
||||
- WEB_CLIENT_LOCATION
|
||||
networks:
|
||||
- internal
|
||||
entrypoint: /docker-entrypoint.sh
|
||||
@ -90,7 +91,7 @@ services:
|
||||
restart_policy:
|
||||
condition: on-failure
|
||||
labels:
|
||||
- "coop-cloud.${STACK_NAME}.version=6.0.2+v1.100.0"
|
||||
- "coop-cloud.${STACK_NAME}.version=6.1.2+v1.111.0"
|
||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost:8008/health"]
|
||||
|
@ -276,3 +276,6 @@ rc_login:
|
||||
account:
|
||||
per_second: {{ env "LOGIN_LIMIT_ACCOUNT_PER_SECOND" }}
|
||||
burst_count: {{ env "LOGIN_LIMIT_ACCOUNT_BURST" }}
|
||||
|
||||
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#web_client_location
|
||||
web_client_location: {{ env "WEB_CLIENT_LOCATION" }}
|
||||
|
@ -13,6 +13,15 @@ http {
|
||||
|
||||
server_name {{ env "DOMAIN" }};
|
||||
|
||||
location = / {
|
||||
proxy_pass http://{{ env "STACK_NAME"}}_app:8008;
|
||||
proxy_set_header X-Forwarded-For $remote_addr;
|
||||
proxy_set_header X-Forwarded-Proto https;
|
||||
proxy_set_header Host $host;
|
||||
client_max_body_size 50M;
|
||||
proxy_http_version 1.1;
|
||||
}
|
||||
|
||||
location ~* ^(\/_matrix|\/_synapse\/client) {
|
||||
proxy_pass http://{{ env "STACK_NAME"}}_app:8008;
|
||||
proxy_set_header X-Forwarded-For $remote_addr;
|
||||
|
Reference in New Issue
Block a user