Compare commits
15 Commits
6.6.0+v1.1
...
main
Author | SHA1 | Date | |
---|---|---|---|
aaa59a7718 | |||
e072cf0766 | |||
22cc356a56 | |||
160b0eb2cf | |||
af7f7eca2f | |||
|
5808fef48d | ||
|
a8483dccf9 | ||
8e82c16e3d | |||
|
dafb17aace | ||
|
237e2c832b | ||
bf4de0df97 | |||
|
61222baaa0 | ||
32721ace23 | |||
|
5a7b7f04ed | ||
|
8809f25ab1 |
23
.env.sample
23
.env.sample
@ -33,6 +33,9 @@ ALLOW_PUBLIC_ROOMS_FEDERATION=false
|
|||||||
ENABLE_REGISTRATION=false
|
ENABLE_REGISTRATION=false
|
||||||
PASSWORD_LOGIN_ENABLED=true
|
PASSWORD_LOGIN_ENABLED=true
|
||||||
|
|
||||||
|
# Token based registration. Enable ADMIN_INTERFACE (below) to use the admin interface to generate tokens.
|
||||||
|
#REGISTRATION_REQUIRES_TOKEN=true
|
||||||
|
|
||||||
## Room auto-join
|
## Room auto-join
|
||||||
|
|
||||||
#AUTO_JOIN_ROOM_ENABLED=1
|
#AUTO_JOIN_ROOM_ENABLED=1
|
||||||
@ -65,6 +68,14 @@ ENCRYPTED_BY_DEFAULT=all
|
|||||||
# Set these to keyservers you trust - usually the same as your federation allowlist
|
# Set these to keyservers you trust - usually the same as your federation allowlist
|
||||||
#TRUSTED_KEYSERVERS="trusted_key_servers:\n - server_name: 'example.com'\n - server_name: 'example2.com'"
|
#TRUSTED_KEYSERVERS="trusted_key_servers:\n - server_name: 'example.com'\n - server_name: 'example2.com'"
|
||||||
|
|
||||||
|
# some optional configs to increase privacy and security
|
||||||
|
#REQUIRE_AUTH_FOR_PROFILE_REQUESTS=true
|
||||||
|
#LIMIT_PROFILE_REQUESTS_TO_USERS_WHO_SHARE_ROOMS=true
|
||||||
|
#DELETE_STALE_DEVICES_AFTER=1y
|
||||||
|
#SESSION_LIFETIME=60d
|
||||||
|
#TRACK_PUPPETED_USER_IPS=true
|
||||||
|
|
||||||
|
|
||||||
## Retention
|
## Retention
|
||||||
|
|
||||||
ALLOWED_LIFETIME_MAX=4w
|
ALLOWED_LIFETIME_MAX=4w
|
||||||
@ -75,6 +86,11 @@ RETENTION_MAX_LIFETIME=4w
|
|||||||
#MEDIA_RETENTION_LOCAL_LIFETIME=30d
|
#MEDIA_RETENTION_LOCAL_LIFETIME=30d
|
||||||
#MEDIA_RETENTION_REMOTE_LIFETIME=14d
|
#MEDIA_RETENTION_REMOTE_LIFETIME=14d
|
||||||
|
|
||||||
|
## Old Signing Key
|
||||||
|
#OLD_SIGNING_KEY_ID=a_OLDKEYID
|
||||||
|
#OLD_SIGNING_KEY=base64string
|
||||||
|
#OLD_SIGNING_KEY_EXPIRES=123456789123
|
||||||
|
|
||||||
## Ratelimit
|
## Ratelimit
|
||||||
|
|
||||||
#LOGIN_LIMIT_IP_PER_SECOND=5
|
#LOGIN_LIMIT_IP_PER_SECOND=5
|
||||||
@ -123,6 +139,13 @@ RETENTION_MAX_LIFETIME=4w
|
|||||||
#SMTP_USER=
|
#SMTP_USER=
|
||||||
#SECRET_SMTP_PASSWORD_VERSION=v1
|
#SECRET_SMTP_PASSWORD_VERSION=v1
|
||||||
|
|
||||||
|
## USER-DIRECTORY
|
||||||
|
|
||||||
|
#USER_DIRECTORY_ENABLED=true
|
||||||
|
#USER_DIRECTORY_SEARCH_ALL_USERS=true
|
||||||
|
#USER_DIRECTORY_PREFER_LOCAL_USERS=true
|
||||||
|
#USER_DIRECTORY_SHOW_LOCKED_USERS=false
|
||||||
|
|
||||||
## App services
|
## App services
|
||||||
|
|
||||||
#APP_SERVICES_ENABLED=1
|
#APP_SERVICES_ENABLED=1
|
||||||
|
2
abra.sh
2
abra.sh
@ -1,6 +1,6 @@
|
|||||||
export DISCORD_BRIDGE_YAML_VERSION=v2
|
export DISCORD_BRIDGE_YAML_VERSION=v2
|
||||||
export ENTRYPOINT_CONF_VERSION=v3
|
export ENTRYPOINT_CONF_VERSION=v3
|
||||||
export HOMESERVER_YAML_VERSION=v29
|
export HOMESERVER_YAML_VERSION=v32
|
||||||
export LOG_CONFIG_VERSION=v2
|
export LOG_CONFIG_VERSION=v2
|
||||||
export SHARED_SECRET_AUTH_VERSION=v2
|
export SHARED_SECRET_AUTH_VERSION=v2
|
||||||
export SIGNAL_BRIDGE_YAML_VERSION=v6
|
export SIGNAL_BRIDGE_YAML_VERSION=v6
|
||||||
|
19
compose.yml
19
compose.yml
@ -30,8 +30,8 @@ services:
|
|||||||
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: curl -f http://${STACK_NAME}_app:8008/health || exit 1
|
test: curl -f http://${STACK_NAME}_app:8008/health || exit 1
|
||||||
interval: 5s
|
interval: 20s
|
||||||
timeout: 3s
|
timeout: 15s
|
||||||
retries: 20
|
retries: 20
|
||||||
|
|
||||||
app:
|
app:
|
||||||
@ -53,8 +53,21 @@ services:
|
|||||||
- ENABLE_3PID_LOOKUP
|
- ENABLE_3PID_LOOKUP
|
||||||
- ENABLE_ALLOWLIST
|
- ENABLE_ALLOWLIST
|
||||||
- ENABLE_REGISTRATION
|
- ENABLE_REGISTRATION
|
||||||
|
- REGISTRATION_REQUIRES_TOKEN
|
||||||
- ENCRYPTED_BY_DEFAULT
|
- ENCRYPTED_BY_DEFAULT
|
||||||
|
- OLD_SIGNING_KEY
|
||||||
|
- OLD_SIGNING_KEY_ID
|
||||||
|
- OLD_SIGNING_KEY_EXPIRES
|
||||||
|
- USER_DIRECTORY_ENABLED=${USER_DIRECTORY_ENABLED:-true}
|
||||||
|
- USER_DIRECTORY_SEARCH_ALL_USERS=${USER_DIRECTORY_SEARCH_ALL_USERS:-true}
|
||||||
|
- USER_DIRECTORY_PREFER_LOCAL_USERS=${USER_DIRECTORY_PREFER_LOCAL_USERS:-true}
|
||||||
|
- USER_DIRECTORY_SHOW_LOCKED_USERS=${USER_DIRECTORY_SHOW_LOCKED_USERS:-false}
|
||||||
- FEDERATION_ALLOWLIST
|
- FEDERATION_ALLOWLIST
|
||||||
|
- REQUIRE_AUTH_FOR_PROFILE_REQUESTS=${REQUIRE_AUTH_FOR_PROFILE_REQUESTS:-false}
|
||||||
|
- LIMIT_PROFILE_REQUESTS_TO_USERS_WHO_SHARE_ROOMS=${LIMIT_PROFILE_REQUESTS_TO_USERS_WHO_SHARE_ROOMS:-false}
|
||||||
|
- DELETE_STALE_DEVICES_AFTER
|
||||||
|
- SESSION_LIFETIME
|
||||||
|
- TRACK_PUPPETED_USER_IPS=${TRACK_PUPPETED_USER_IPS:-false}
|
||||||
- LETSENCRYPT_HOST=${DOMAIN}
|
- LETSENCRYPT_HOST=${DOMAIN}
|
||||||
- MEDIA_RETENTION_LOCAL_LIFETIME
|
- MEDIA_RETENTION_LOCAL_LIFETIME
|
||||||
- MEDIA_RETENTION_REMOTE_LIFETIME
|
- MEDIA_RETENTION_REMOTE_LIFETIME
|
||||||
@ -91,7 +104,7 @@ services:
|
|||||||
restart_policy:
|
restart_policy:
|
||||||
condition: on-failure
|
condition: on-failure
|
||||||
labels:
|
labels:
|
||||||
- "coop-cloud.${STACK_NAME}.version=6.6.0+v1.124.0"
|
- "coop-cloud.${STACK_NAME}.version=6.6.3+v1.124.0"
|
||||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
- "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"]
|
||||||
|
@ -16,6 +16,12 @@ server_name: {{ or (env "SERVER_NAME") (env "DOMAIN") }}
|
|||||||
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#public_baseurl
|
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#public_baseurl
|
||||||
public_baseurl: https://{{ env "DOMAIN" }}/
|
public_baseurl: https://{{ env "DOMAIN" }}/
|
||||||
|
|
||||||
|
# https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#require_auth_for_profile_requests
|
||||||
|
require_auth_for_profile_requests: {{ env "REQUIRE_AUTH_FOR_PROFILE_REQUESTS" }}
|
||||||
|
|
||||||
|
# https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#limit_profile_requests_to_users_who_share_rooms
|
||||||
|
limit_profile_requests_to_users_who_share_rooms: {{ env "LIMIT_PROFILE_REQUESTS_TO_USERS_WHO_SHARE_ROOMS" }}
|
||||||
|
|
||||||
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#serve_server_wellknown
|
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#serve_server_wellknown
|
||||||
serve_server_wellknown: {{ env "SERVE_SERVER_WELLKNOWN" }}
|
serve_server_wellknown: {{ env "SERVE_SERVER_WELLKNOWN" }}
|
||||||
|
|
||||||
@ -52,6 +58,11 @@ listeners:
|
|||||||
{{ end }}
|
{{ end }}
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
|
# https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#delete_stale_devices_after
|
||||||
|
{{ if (env "DELETE_STALE_DEVICES_AFTER") }}
|
||||||
|
delete_stale_devices_after: {{ env "DELETE_STALE_DEVICES_AFTER" }}
|
||||||
|
{{ end }}
|
||||||
|
|
||||||
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#admin_contact
|
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#admin_contact
|
||||||
admin_contact: 'mailto:{{ env "ADMIN_EMAIL" }}'
|
admin_contact: 'mailto:{{ env "ADMIN_EMAIL" }}'
|
||||||
|
|
||||||
@ -132,6 +143,9 @@ turn_allow_guests: {{ env "TURN_ALLOW_GUESTS" }}
|
|||||||
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#enable_registration
|
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#enable_registration
|
||||||
enable_registration: {{ env "ENABLE_REGISTRATION" }}
|
enable_registration: {{ env "ENABLE_REGISTRATION" }}
|
||||||
|
|
||||||
|
# https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#registration_requires_token
|
||||||
|
registration_requires_token: {{ env "REGISTRATION_REQUIRES_TOKEN" }}
|
||||||
|
|
||||||
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#enable_3pid_lookup
|
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#enable_3pid_lookup
|
||||||
enable_3pid_lookup: {{ env "ENABLE_3PID_LOOKUP" }}
|
enable_3pid_lookup: {{ env "ENABLE_3PID_LOOKUP" }}
|
||||||
|
|
||||||
@ -147,9 +161,17 @@ auto_join_rooms:
|
|||||||
- "{{ env "AUTO_JOIN_ROOM" }}"
|
- "{{ env "AUTO_JOIN_ROOM" }}"
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
|
# https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#session_lifetime
|
||||||
|
{{ if (env "SESSION_LIFETIME") }}
|
||||||
|
session_lifetime: {{ env "SESSION_LIFETIME" }}
|
||||||
|
{{ end }}
|
||||||
|
|
||||||
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#report_stats
|
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#report_stats
|
||||||
report_stats: false
|
report_stats: false
|
||||||
|
|
||||||
|
# https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#track_puppeted_user_ips
|
||||||
|
track_puppeted_user_ips: {{ env "TRACK_PUPPETED_USER_IPS" }}
|
||||||
|
|
||||||
{{ if eq (env "APP_SERVICES_ENABLED") "1" }}
|
{{ if eq (env "APP_SERVICES_ENABLED") "1" }}
|
||||||
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#app_service_config_files
|
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#app_service_config_files
|
||||||
app_service_config_files: {{ env "APP_SERVICE_CONFIGS" }}
|
app_service_config_files: {{ env "APP_SERVICE_CONFIGS" }}
|
||||||
@ -164,6 +186,12 @@ form_secret: "{{ secret "form_secret" }}"
|
|||||||
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#signing_key_path
|
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#signing_key_path
|
||||||
signing_key_path: "/data/{{ env "DOMAIN" }}.signing.key"
|
signing_key_path: "/data/{{ env "DOMAIN" }}.signing.key"
|
||||||
|
|
||||||
|
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#old_signing_keys
|
||||||
|
{{ if (and (env "OLD_SIGNING_KEY_ID") (env "OLD_SIGNING_KEY") (env "OLD_SIGNING_KEY_EXPIRES")) }}
|
||||||
|
old_signing_keys:
|
||||||
|
"ed25519:{{ env "OLD_SIGNING_KEY_ID" }}": { key: "{{ env "OLD_SIGNING_KEY" }}", expired_ts: {{ env "OLD_SIGNING_KEY_EXPIRES" }} }
|
||||||
|
{{ end }}
|
||||||
|
|
||||||
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#trusted_key_servers
|
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#trusted_key_servers
|
||||||
{{ if eq (env "ENABLE_ALLOWLIST") "1" }}
|
{{ if eq (env "ENABLE_ALLOWLIST") "1" }}
|
||||||
trusted_key_servers: [] # NOTE(d1): defaults to requesting server directly, which matches FEDERATION_ALLOWLIST
|
trusted_key_servers: [] # NOTE(d1): defaults to requesting server directly, which matches FEDERATION_ALLOWLIST
|
||||||
@ -246,9 +274,10 @@ encryption_enabled_by_default_for_room_type: {{ env "ENCRYPTED_BY_DEFAULT" }}
|
|||||||
|
|
||||||
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#user_directory
|
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#user_directory
|
||||||
user_directory:
|
user_directory:
|
||||||
enabled: true
|
enabled: {{ env "USER_DIRECTORY_ENABLED" }}
|
||||||
search_all_users: true
|
search_all_users: {{ env "USER_DIRECTORY_SEARCH_ALL_USERS" }}
|
||||||
prefer_local_users: true
|
prefer_local_users: {{ env "USER_DIRECTORY_PREFER_LOCAL_USERS" }}
|
||||||
|
show_locked_users: {{ env "USER_DIRECTORY_SHOW_LOCKED_USERS" }}
|
||||||
|
|
||||||
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#media_retention
|
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#media_retention
|
||||||
media_retention:
|
media_retention:
|
||||||
|
1
release/6.6.1+v1.124.0
Normal file
1
release/6.6.1+v1.124.0
Normal file
@ -0,0 +1 @@
|
|||||||
|
added env REGISTRATION_REQUIRES_TOKEN
|
1
release/6.6.2+v1.124.0
Normal file
1
release/6.6.2+v1.124.0
Normal file
@ -0,0 +1 @@
|
|||||||
|
new optional env vars for user_directory and privacy options
|
1
release/6.6.3+v1.124.0
Normal file
1
release/6.6.3+v1.124.0
Normal file
@ -0,0 +1 @@
|
|||||||
|
added env for old-signing-keys
|
Loading…
x
Reference in New Issue
Block a user