fix: drop config if not using
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/push Build is failing
Details
This commit is contained in:
parent
116840623b
commit
a85310346b
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=v25
|
export HOMESERVER_YAML_VERSION=v26
|
||||||
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
|
||||||
|
|
|
@ -173,8 +173,8 @@ trusted_key_servers:
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#oidc_providers
|
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#oidc_providers
|
||||||
|
{{ if eq (env "KEYCLOAK_ENABLED") "1" }}
|
||||||
oidc_providers:
|
oidc_providers:
|
||||||
{{ if eq (env "KEYCLOAK_ENABLED") "1" }}
|
|
||||||
- idp_id: {{ env "KEYCLOAK_ID" }}
|
- idp_id: {{ env "KEYCLOAK_ID" }}
|
||||||
idp_name: {{ env "KEYCLOAK_NAME" }}
|
idp_name: {{ env "KEYCLOAK_NAME" }}
|
||||||
issuer: "{{ env "KEYCLOAK_URL" }}"
|
issuer: "{{ env "KEYCLOAK_URL" }}"
|
||||||
|
@ -186,7 +186,6 @@ oidc_providers:
|
||||||
config:
|
config:
|
||||||
localpart_template: "{{ "{{ user.preferred_username }}" }}"
|
localpart_template: "{{ "{{ user.preferred_username }}" }}"
|
||||||
display_name_template: "{{ "{{ user.name }}" }}"
|
display_name_template: "{{ "{{ user.name }}" }}"
|
||||||
{{ end }}
|
|
||||||
|
|
||||||
{{ if eq (env "KEYCLOAK2_ENABLED") "1" }}
|
{{ if eq (env "KEYCLOAK2_ENABLED") "1" }}
|
||||||
- idp_id: {{ env "KEYCLOAK2_ID" }}
|
- idp_id: {{ env "KEYCLOAK2_ID" }}
|
||||||
|
@ -215,22 +214,22 @@ oidc_providers:
|
||||||
localpart_template: "{{ "{{ user.preferred_username }}" }}"
|
localpart_template: "{{ "{{ user.preferred_username }}" }}"
|
||||||
display_name_template: "{{ "{{ user.name }}" }}"
|
display_name_template: "{{ "{{ user.name }}" }}"
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
{{ end }}
|
||||||
|
|
||||||
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#sso
|
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#sso
|
||||||
|
{{ if eq (env "KEYCLOAK_ENABLED") "1" }}
|
||||||
sso:
|
sso:
|
||||||
{{ if eq (env "KEYCLOAK_ENABLED") "1" }}
|
client_whitelist:
|
||||||
client_whitelist:
|
- https://{{ env "KEYCLOAK_CLIENT_DOMAIN" }}
|
||||||
- https://{{ env "KEYCLOAK_CLIENT_DOMAIN" }}
|
{{ end }}
|
||||||
{{ end }}
|
|
||||||
|
|
||||||
|
|
||||||
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#password_config
|
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#password_config
|
||||||
password_config:
|
password_config:
|
||||||
enabled: {{ env "PASSWORD_LOGIN_ENABLED" }}
|
enabled: {{ env "PASSWORD_LOGIN_ENABLED" }}
|
||||||
|
|
||||||
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#email
|
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#email
|
||||||
|
{{ if eq (env "SMTP_ENABLED") "1" }}
|
||||||
email:
|
email:
|
||||||
{{ if eq (env "SMTP_ENABLED") "1" }}
|
|
||||||
smtp_host: {{ env "SMTP_HOST" }}
|
smtp_host: {{ env "SMTP_HOST" }}
|
||||||
smtp_port: {{ env "SMTP_PORT" }}
|
smtp_port: {{ env "SMTP_PORT" }}
|
||||||
smtp_user: {{ env "SMTP_USER" }}
|
smtp_user: {{ env "SMTP_USER" }}
|
||||||
|
@ -240,7 +239,7 @@ email:
|
||||||
app_name: {{ env "SMTP_APP_NAME" }}
|
app_name: {{ env "SMTP_APP_NAME" }}
|
||||||
enable_notifs: true
|
enable_notifs: true
|
||||||
client_base_url: https://{{ env "DOMAIN" }}
|
client_base_url: https://{{ env "DOMAIN" }}
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#encryption_enabled_by_default_for_room_type
|
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#encryption_enabled_by_default_for_room_type
|
||||||
encryption_enabled_by_default_for_room_type: {{ env "ENCRYPTED_BY_DEFAULT" }}
|
encryption_enabled_by_default_for_room_type: {{ env "ENCRYPTED_BY_DEFAULT" }}
|
||||||
|
|
Loading…
Reference in New Issue