Add defaults

This commit is contained in:
Julian-Samuel Gebühr 2022-07-09 11:55:49 +02:00
parent 9ee5785704
commit 135096e53a
2 changed files with 19 additions and 1 deletions

View file

@ -1088,6 +1088,9 @@ matrix_bot_maubot_registration_shared_secret: |-
}[matrix_homeserver_implementation] }[matrix_homeserver_implementation]
}} }}
# Postgres is the default, except if not using `matrix_postgres` (internal postgres)
matrix_bot_maubot_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}"
matrix_bot_maubot_database_password: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'mxpup.dsc.db') | to_uuid }}"
###################################################################### ######################################################################
# #
@ -1805,6 +1808,12 @@ matrix_postgres_additional_databases: |
'password': matrix_bot_honoroit_database_password, 'password': matrix_bot_honoroit_database_password,
}] if (matrix_bot_honoroit_enabled and matrix_bot_honoroit_database_engine == 'postgres' and matrix_bot_honoroit_database_hostname == 'matrix-postgres') else []) }] if (matrix_bot_honoroit_enabled and matrix_bot_honoroit_database_engine == 'postgres' and matrix_bot_honoroit_database_hostname == 'matrix-postgres') else [])
+ +
([{
'name': matrix_bot_maubot_database_name,
'username': matrix_bot_maubot_database_username,
'password': matrix_bot_maubot_database_password,
}] if (matrix_bot_maubot_enabled and matrix_bot_maubot_database_engine == 'postgres' and matrix_bot_maubot_database_hostname == 'matrix-postgres') else [])
+
([{ ([{
'name': matrix_bot_buscarron_database_name, 'name': matrix_bot_buscarron_database_name,
'username': matrix_bot_buscarron_database_username, 'username': matrix_bot_buscarron_database_username,

View file

@ -17,7 +17,16 @@ matrix_bot_maubot_bot_server_public: "https://{{ matrix_server_fqn_matrix }}"
matrix_bot_maubot_proxy_management_interface: false matrix_bot_maubot_proxy_management_interface: false
matrix_bot_maubot_expose_management_interface: true matrix_bot_maubot_expose_management_interface: true
matrix_bot_maubot_database_uri: 'sqlite:////data/maubot.db' matrix_bot_maubot_database_engine: sqlite
matrix_bot_maubot_sqlite_database_path_local: "{{ matrix_bot_maubot_data_path }}/maubot.db"
matrix_bot_maubot_sqlite_database_path_in_container: "/data/maubot.db"
matrix_bot_maubot_database_username: matrix_bot_maubot
matrix_bot_maubot_database_password: ~
matrix_bot_maubot_database_hostname: 'matrix-postgres'
matrix_bot_maubot_database_port: 5432
matrix_bot_maubot_database_name: matrix_bot_maubot
matrix_bot_maubot_port: 29316 matrix_bot_maubot_port: 29316
matrix_bot_maubot_secret: 'generate' matrix_bot_maubot_secret: 'generate'