Compare commits
7 Commits
3.6.0+v1.8
...
3.9.0+v1.8
| Author | SHA1 | Date | |
|---|---|---|---|
| 935b2ccf9f | |||
| 2445d9f33a | |||
| 2a45273541 | |||
| 48efb7de51 | |||
| b2e8bf9c8b | |||
| d02981a2bf | |||
| c6f9b117e2 |
@ -119,6 +119,7 @@ RETENTION_MAX_LIFETIME=4w
|
|||||||
#ENABLE_ENCRYPTION=true
|
#ENABLE_ENCRYPTION=true
|
||||||
#TELEGRAM_APP_ID=
|
#TELEGRAM_APP_ID=
|
||||||
#TELEGRAM_BRIDGE_PERMISSIONS="{ \"*\": \"relaybot\" }"
|
#TELEGRAM_BRIDGE_PERMISSIONS="{ \"*\": \"relaybot\" }"
|
||||||
|
#TELEGRAM_SYNC_CHANNEL_MEMBERS=true
|
||||||
#SECRET_TELEGRAM_DB_PASSWORD_VERSION=v1
|
#SECRET_TELEGRAM_DB_PASSWORD_VERSION=v1
|
||||||
#SECRET_TELEGRAM_API_HASH_VERSION=v1
|
#SECRET_TELEGRAM_API_HASH_VERSION=v1
|
||||||
#SECRET_TELEGRAM_BOT_TOKEN_VERSION=v1
|
#SECRET_TELEGRAM_BOT_TOKEN_VERSION=v1
|
||||||
|
|||||||
2
abra.sh
2
abra.sh
@ -4,4 +4,4 @@ export HOMESERVER_YAML_VERSION=v22
|
|||||||
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=v5
|
export TELEGRAM_BRIDGE_YAML_VERSION=v6
|
||||||
|
|||||||
@ -6,8 +6,10 @@ services:
|
|||||||
secrets:
|
secrets:
|
||||||
- keycloak2_client_secret
|
- keycloak2_client_secret
|
||||||
environment:
|
environment:
|
||||||
|
- KEYCLOAK2_ALLOW_EXISTING_USERS
|
||||||
- KEYCLOAK2_CLIENT_ID
|
- KEYCLOAK2_CLIENT_ID
|
||||||
- KEYCLOAK2_ENABLED
|
- KEYCLOAK2_ENABLED
|
||||||
|
- KEYCLOAK2_ID
|
||||||
- KEYCLOAK2_NAME
|
- KEYCLOAK2_NAME
|
||||||
- KEYCLOAK2_URL
|
- KEYCLOAK2_URL
|
||||||
|
|
||||||
|
|||||||
@ -17,7 +17,7 @@ services:
|
|||||||
- signald-data:/signald
|
- signald-data:/signald
|
||||||
|
|
||||||
signalbridge:
|
signalbridge:
|
||||||
image: dock.mau.dev/mautrix/signal:v0.4.2
|
image: dock.mau.dev/mautrix/signal:v0.4.3
|
||||||
depends_on:
|
depends_on:
|
||||||
- signaldb
|
- signaldb
|
||||||
configs:
|
configs:
|
||||||
|
|||||||
@ -10,7 +10,7 @@ services:
|
|||||||
- telegram-data:/telegram-data
|
- telegram-data:/telegram-data
|
||||||
|
|
||||||
telegrambridge:
|
telegrambridge:
|
||||||
image: dock.mau.dev/mautrix/telegram:v0.13.0
|
image: dock.mau.dev/mautrix/telegram:v0.14.0
|
||||||
depends_on:
|
depends_on:
|
||||||
- telegramdb
|
- telegramdb
|
||||||
configs:
|
configs:
|
||||||
@ -25,6 +25,7 @@ services:
|
|||||||
- HOMESERVER_URL
|
- HOMESERVER_URL
|
||||||
- TELEGRAM_APP_ID
|
- TELEGRAM_APP_ID
|
||||||
- TELEGRAM_BRIDGE_PERMISSIONS
|
- TELEGRAM_BRIDGE_PERMISSIONS
|
||||||
|
- TELEGRAM_SYNC_CHANNEL_MEMBERS
|
||||||
- VERIFY_SSL
|
- VERIFY_SSL
|
||||||
secrets:
|
secrets:
|
||||||
- telegram_api_hash
|
- telegram_api_hash
|
||||||
|
|||||||
16
compose.yml
16
compose.yml
@ -3,7 +3,7 @@ version: "3.8"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: "matrixdotorg/synapse:v1.81.0"
|
image: "matrixdotorg/synapse:v1.87.0"
|
||||||
volumes:
|
volumes:
|
||||||
- "data:/data"
|
- "data:/data"
|
||||||
depends_on:
|
depends_on:
|
||||||
@ -61,7 +61,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=3.6.0+v1.81.0"
|
- "coop-cloud.${STACK_NAME}.version=3.9.0+v1.87.0"
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "curl", "-f", "http://localhost:8008/health"]
|
||||||
|
interval: 30s
|
||||||
|
timeout: 10s
|
||||||
|
retries: 10
|
||||||
|
start_period: 1m
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: postgres:13-alpine
|
image: postgres:13-alpine
|
||||||
@ -77,7 +83,11 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "pg_isready", "-U", "$POSTGRES_USER" ]
|
test: ["CMD", "pg_isready", "-U", "synapse"]
|
||||||
|
interval: 30s
|
||||||
|
timeout: 10s
|
||||||
|
retries: 10
|
||||||
|
start_period: 1m
|
||||||
volumes:
|
volumes:
|
||||||
- postgres:/var/lib/postgresql/data
|
- postgres:/var/lib/postgresql/data
|
||||||
deploy:
|
deploy:
|
||||||
|
|||||||
@ -609,12 +609,13 @@ oidc_providers:
|
|||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
{{ if eq (env "KEYCLOAK2_ENABLED") "1" }}
|
{{ if eq (env "KEYCLOAK2_ENABLED") "1" }}
|
||||||
- idp_id: keycloak2
|
- idp_id: {{ env "KEYCLOAK2_ID" }}
|
||||||
idp_name: {{ env "KEYCLOAK2_NAME" }}
|
idp_name: {{ env "KEYCLOAK2_NAME" }}
|
||||||
issuer: "{{ env "KEYCLOAK2_URL" }}"
|
issuer: "{{ env "KEYCLOAK2_URL" }}"
|
||||||
client_id: "{{ env "KEYCLOAK2_CLIENT_ID" }}"
|
client_id: "{{ env "KEYCLOAK2_CLIENT_ID" }}"
|
||||||
client_secret: "{{ secret "keycloak2_client_secret" }}"
|
client_secret: "{{ secret "keycloak2_client_secret" }}"
|
||||||
scopes: ["openid", "profile"]
|
scopes: ["openid", "profile"]
|
||||||
|
allow_existing_users: {{ env "KEYCLOAK2_ALLOW_EXISTING_USERS" }}
|
||||||
user_mapping_provider:
|
user_mapping_provider:
|
||||||
config:
|
config:
|
||||||
localpart_template: "{{ "{{ user.preferred_username }}" }}"
|
localpart_template: "{{ "{{ user.preferred_username }}" }}"
|
||||||
@ -622,12 +623,13 @@ oidc_providers:
|
|||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
{{ if eq (env "KEYCLOAK3_ENABLED") "1" }}
|
{{ if eq (env "KEYCLOAK3_ENABLED") "1" }}
|
||||||
- idp_id: keycloak3
|
- idp_id: {{ env "KEYCLOAK3_ID" }}
|
||||||
idp_name: {{ env "KEYCLOAK3_NAME" }}
|
idp_name: {{ env "KEYCLOAK3_NAME" }}
|
||||||
issuer: "{{ env "KEYCLOAK3_URL" }}"
|
issuer: "{{ env "KEYCLOAK3_URL" }}"
|
||||||
client_id: "{{ env "KEYCLOAK3_CLIENT_ID" }}"
|
client_id: "{{ env "KEYCLOAK3_CLIENT_ID" }}"
|
||||||
client_secret: "{{ secret "keycloak3_client_secret" }}"
|
client_secret: "{{ secret "keycloak3_client_secret" }}"
|
||||||
scopes: ["openid", "profile"]
|
scopes: ["openid", "profile"]
|
||||||
|
allow_existing_users: {{ env "KEYCLOAK3_ALLOW_EXISTING_USERS" }}
|
||||||
user_mapping_provider:
|
user_mapping_provider:
|
||||||
config:
|
config:
|
||||||
localpart_template: "{{ "{{ user.preferred_username }}" }}"
|
localpart_template: "{{ "{{ user.preferred_username }}" }}"
|
||||||
|
|||||||
@ -151,7 +151,7 @@ bridge:
|
|||||||
# Whether or not to sync the member list in channels.
|
# Whether or not to sync the member list in channels.
|
||||||
# If no channel admins have logged into the bridge, the bridge won't be able to sync the member
|
# If no channel admins have logged into the bridge, the bridge won't be able to sync the member
|
||||||
# list regardless of this setting.
|
# list regardless of this setting.
|
||||||
sync_channel_members: true
|
sync_channel_members: {{ env "TELEGRAM_SYNC_CHANNEL_MEMBERS" }}
|
||||||
# Whether or not to skip deleted members when syncing members.
|
# Whether or not to skip deleted members when syncing members.
|
||||||
skip_deleted_members: true
|
skip_deleted_members: true
|
||||||
# Whether or not to automatically synchronize contacts and chats of Matrix users logged into
|
# Whether or not to automatically synchronize contacts and chats of Matrix users logged into
|
||||||
|
|||||||
Reference in New Issue
Block a user