Merge branch 'master' into bye-bye-nginx-proxy

This commit is contained in:
Slavi Pantaleev
2024-01-13 10:25:35 +02:00
4 changed files with 73 additions and 4 deletions

View File

@ -2064,9 +2064,11 @@ matrix_bot_matrix_reminder_bot_systemd_required_services_list_auto: |
+
([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled and matrix_bot_matrix_reminder_bot_database_hostname == devture_postgres_connection_hostname else [])
}}
matrix_bot_matrix_reminder_bot_container_image_self_build: "{{ matrix_architecture != 'amd64' }}"
matrix_bot_matrix_reminder_bot_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm64'] }}"
matrix_bot_matrix_reminder_bot_container_network: "{{ matrix_addons_container_network }}"
matrix_bot_matrix_reminder_bot_container_additional_networks_auto: |-
{{
(
@ -2083,6 +2085,10 @@ matrix_bot_matrix_reminder_bot_database_engine: "{{ 'postgres' if devture_postgr
matrix_bot_matrix_reminder_bot_database_hostname: "{{ devture_postgres_connection_hostname if devture_postgres_enabled else '' }}"
matrix_bot_matrix_reminder_bot_database_password: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'reminder.bot.db', rounds=655555) | to_uuid }}"
matrix_bot_matrix_reminder_bot_allowlist_enabled: true
matrix_bot_matrix_reminder_bot_allowlist_regexes_auto:
- "@[a-z0-9-_.]+:{{ matrix_domain }}"
######################################################################
#
# /matrix-bot-matrix-reminder-bot