Compare commits
5 Commits
3.2.0+v1.7
...
3.4.0+v1.8
| Author | SHA1 | Date | |
|---|---|---|---|
| 37e4852798 | |||
| 74fb8014fa | |||
| 787e0fb3a9 | |||
| ead52c1acd | |||
| fca551b735 |
10
.env.sample
10
.env.sample
@ -72,6 +72,16 @@ RETENTION_MAX_LIFETIME=4w
|
|||||||
|
|
||||||
## TURN
|
## TURN
|
||||||
|
|
||||||
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.keycloak3.yml"
|
||||||
|
#KEYCLOAK3_ENABLED=1
|
||||||
|
#KEYCLOAK3_ID=keycloak3
|
||||||
|
#KEYCLOAK3_NAME=
|
||||||
|
#KEYCLOAK3_URL=
|
||||||
|
#KEYCLOAK3_CLIENT_ID=
|
||||||
|
#KEYCLOAK3_CLIENT_DOMAIN=
|
||||||
|
#KEYCLOAK3_ALLOW_EXISTING_USERS=false
|
||||||
|
#SECRET_KEYCLOAK3_CLIENT_SECRET_VERSION=v1
|
||||||
|
|
||||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.turn.yml"
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.turn.yml"
|
||||||
#TURN_ENABLED=1
|
#TURN_ENABLED=1
|
||||||
#TURN_URIS="[\"turns:coturn.foo.zone?transport=udp\", \"turns:coturn.foo.zone?transport=tcp\"]"
|
#TURN_URIS="[\"turns:coturn.foo.zone?transport=udp\", \"turns:coturn.foo.zone?transport=tcp\"]"
|
||||||
|
|||||||
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=v1
|
export ENTRYPOINT_CONF_VERSION=v1
|
||||||
export HOMESERVER_YAML_VERSION=v17
|
export HOMESERVER_YAML_VERSION=v18
|
||||||
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
|
||||||
|
|||||||
17
compose.keycloak2.yml
Normal file
17
compose.keycloak2.yml
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
---
|
||||||
|
version: "3.8"
|
||||||
|
|
||||||
|
services:
|
||||||
|
app:
|
||||||
|
secrets:
|
||||||
|
- keycloak2_client_secret
|
||||||
|
environment:
|
||||||
|
- KEYCLOAK2_CLIENT_ID
|
||||||
|
- KEYCLOAK2_ENABLED
|
||||||
|
- KEYCLOAK2_NAME
|
||||||
|
- KEYCLOAK2_URL
|
||||||
|
|
||||||
|
secrets:
|
||||||
|
keycloak2_client_secret:
|
||||||
|
external: true
|
||||||
|
name: ${STACK_NAME}_keycloak2_client_secret_${SECRET_KEYCLOAK2_CLIENT_SECRET_VERSION}
|
||||||
19
compose.keycloak3.yml
Normal file
19
compose.keycloak3.yml
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
---
|
||||||
|
version: "3.8"
|
||||||
|
|
||||||
|
services:
|
||||||
|
app:
|
||||||
|
secrets:
|
||||||
|
- keycloak3_client_secret
|
||||||
|
environment:
|
||||||
|
- KEYCLOAK3_ALLOW_EXISTING_USERS
|
||||||
|
- KEYCLOAK3_CLIENT_ID
|
||||||
|
- KEYCLOAK3_ENABLED
|
||||||
|
- KEYCLOAK3_ID
|
||||||
|
- KEYCLOAK3_NAME
|
||||||
|
- KEYCLOAK3_URL
|
||||||
|
|
||||||
|
secrets:
|
||||||
|
keycloak3_client_secret:
|
||||||
|
external: true
|
||||||
|
name: ${STACK_NAME}_keycloak3_client_secret_${SECRET_KEYCLOAK3_CLIENT_SECRET_VERSION}
|
||||||
@ -10,7 +10,7 @@ services:
|
|||||||
- telegram-data:/telegram-data
|
- telegram-data:/telegram-data
|
||||||
|
|
||||||
telegrambridge:
|
telegrambridge:
|
||||||
image: dock.mau.dev/mautrix/telegram:v0.12.2
|
image: dock.mau.dev/mautrix/telegram:v0.13.0
|
||||||
depends_on:
|
depends_on:
|
||||||
- telegramdb
|
- telegramdb
|
||||||
configs:
|
configs:
|
||||||
|
|||||||
@ -3,7 +3,7 @@ version: "3.8"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: "matrixdotorg/synapse:v1.76.0"
|
image: "matrixdotorg/synapse:v1.80.0"
|
||||||
volumes:
|
volumes:
|
||||||
- "data:/data"
|
- "data:/data"
|
||||||
depends_on:
|
depends_on:
|
||||||
@ -61,7 +61,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=3.1.0+v1.76.0"
|
- "coop-cloud.${STACK_NAME}.version=3.4.0+v1.80.0"
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: postgres:13-alpine
|
image: postgres:13-alpine
|
||||||
|
|||||||
@ -604,6 +604,32 @@ oidc_providers:
|
|||||||
display_name_template: "{{ "{{ user.name }}" }}"
|
display_name_template: "{{ "{{ user.name }}" }}"
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
|
{{ if eq (env "KEYCLOAK2_ENABLED") "1" }}
|
||||||
|
- idp_id: keycloak2
|
||||||
|
idp_name: {{ env "KEYCLOAK2_NAME" }}
|
||||||
|
issuer: "{{ env "KEYCLOAK2_URL" }}"
|
||||||
|
client_id: "{{ env "KEYCLOAK2_CLIENT_ID" }}"
|
||||||
|
client_secret: "{{ secret "keycloak2_client_secret" }}"
|
||||||
|
scopes: ["openid", "profile"]
|
||||||
|
user_mapping_provider:
|
||||||
|
config:
|
||||||
|
localpart_template: "{{ "{{ user.preferred_username }}" }}"
|
||||||
|
display_name_template: "{{ "{{ user.name }}" }}"
|
||||||
|
{{ end }}
|
||||||
|
|
||||||
|
{{ if eq (env "KEYCLOAK3_ENABLED") "1" }}
|
||||||
|
- idp_id: keycloak3
|
||||||
|
idp_name: {{ env "KEYCLOAK3_NAME" }}
|
||||||
|
issuer: "{{ env "KEYCLOAK3_URL" }}"
|
||||||
|
client_id: "{{ env "KEYCLOAK3_CLIENT_ID" }}"
|
||||||
|
client_secret: "{{ secret "keycloak3_client_secret" }}"
|
||||||
|
scopes: ["openid", "profile"]
|
||||||
|
user_mapping_provider:
|
||||||
|
config:
|
||||||
|
localpart_template: "{{ "{{ user.preferred_username }}" }}"
|
||||||
|
display_name_template: "{{ "{{ user.name }}" }}"
|
||||||
|
{{ end }}
|
||||||
|
|
||||||
# Additional settings to use with single-sign on systems such as OpenID Connect,
|
# Additional settings to use with single-sign on systems such as OpenID Connect,
|
||||||
# SAML2 and CAS.
|
# SAML2 and CAS.
|
||||||
#
|
#
|
||||||
|
|||||||
Reference in New Issue
Block a user