Potentially add matrix-postgres.service as required for bridges, etc.
This commit is contained in:
		| @@ -61,6 +61,8 @@ matrix_appservice_discord_systemd_required_services_list: | | |||||||
|     ['docker.service'] |     ['docker.service'] | ||||||
|     + |     + | ||||||
|     (['matrix-synapse.service'] if matrix_synapse_enabled else []) |     (['matrix-synapse.service'] if matrix_synapse_enabled else []) | ||||||
|  |     + | ||||||
|  |     (['matrix-postgres.service'] if matrix_postgres_enabled else []) | ||||||
|   }} |   }} | ||||||
|  |  | ||||||
| matrix_appservice_discord_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'discord.as.token') | to_uuid }}" | matrix_appservice_discord_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'discord.as.token') | to_uuid }}" | ||||||
| @@ -207,6 +209,8 @@ matrix_mautrix_facebook_systemd_required_services_list: | | |||||||
|     ['docker.service'] |     ['docker.service'] | ||||||
|     + |     + | ||||||
|     (['matrix-synapse.service'] if matrix_synapse_enabled else []) |     (['matrix-synapse.service'] if matrix_synapse_enabled else []) | ||||||
|  |     + | ||||||
|  |     (['matrix-postgres.service'] if matrix_postgres_enabled else []) | ||||||
|   }} |   }} | ||||||
|  |  | ||||||
| matrix_mautrix_facebook_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'fb.as.token') | to_uuid }}" | matrix_mautrix_facebook_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'fb.as.token') | to_uuid }}" | ||||||
| @@ -244,6 +248,8 @@ matrix_mautrix_hangouts_systemd_required_services_list: | | |||||||
|     ['docker.service'] |     ['docker.service'] | ||||||
|     + |     + | ||||||
|     (['matrix-synapse.service'] if matrix_synapse_enabled else []) |     (['matrix-synapse.service'] if matrix_synapse_enabled else []) | ||||||
|  |     + | ||||||
|  |     (['matrix-postgres.service'] if matrix_postgres_enabled else []) | ||||||
|   }} |   }} | ||||||
|  |  | ||||||
| matrix_mautrix_hangouts_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'ho.as.token') | to_uuid }}" | matrix_mautrix_hangouts_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'ho.as.token') | to_uuid }}" | ||||||
| @@ -282,6 +288,8 @@ matrix_mautrix_telegram_systemd_required_services_list: | | |||||||
|     ['docker.service'] |     ['docker.service'] | ||||||
|     + |     + | ||||||
|     (['matrix-synapse.service'] if matrix_synapse_enabled else []) |     (['matrix-synapse.service'] if matrix_synapse_enabled else []) | ||||||
|  |     + | ||||||
|  |     (['matrix-postgres.service'] if matrix_postgres_enabled else []) | ||||||
|   }} |   }} | ||||||
|  |  | ||||||
| matrix_mautrix_telegram_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'telegr.as.token') | to_uuid }}" | matrix_mautrix_telegram_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'telegr.as.token') | to_uuid }}" | ||||||
| @@ -318,6 +326,8 @@ matrix_mautrix_whatsapp_systemd_required_services_list: | | |||||||
|     ['docker.service'] |     ['docker.service'] | ||||||
|     + |     + | ||||||
|     (['matrix-synapse.service'] if matrix_synapse_enabled else []) |     (['matrix-synapse.service'] if matrix_synapse_enabled else []) | ||||||
|  |     + | ||||||
|  |     (['matrix-postgres.service'] if matrix_postgres_enabled else []) | ||||||
|   }} |   }} | ||||||
|  |  | ||||||
| matrix_mautrix_whatsapp_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'whats.as.token') | to_uuid }}" | matrix_mautrix_whatsapp_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'whats.as.token') | to_uuid }}" | ||||||
| @@ -378,6 +388,8 @@ matrix_mx_puppet_skype_systemd_required_services_list: | | |||||||
|     ['docker.service'] |     ['docker.service'] | ||||||
|     + |     + | ||||||
|     (['matrix-synapse.service'] if matrix_synapse_enabled else []) |     (['matrix-synapse.service'] if matrix_synapse_enabled else []) | ||||||
|  |     + | ||||||
|  |     (['matrix-postgres.service'] if matrix_postgres_enabled else []) | ||||||
|   }} |   }} | ||||||
|  |  | ||||||
| matrix_mx_puppet_skype_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'skype.as.tok') | to_uuid }}" | matrix_mx_puppet_skype_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'skype.as.tok') | to_uuid }}" | ||||||
| @@ -413,6 +425,8 @@ matrix_mx_puppet_slack_systemd_required_services_list: | | |||||||
|     ['docker.service'] |     ['docker.service'] | ||||||
|     + |     + | ||||||
|     (['matrix-synapse.service'] if matrix_synapse_enabled else []) |     (['matrix-synapse.service'] if matrix_synapse_enabled else []) | ||||||
|  |     + | ||||||
|  |     (['matrix-postgres.service'] if matrix_postgres_enabled else []) | ||||||
|   }} |   }} | ||||||
|  |  | ||||||
| matrix_mx_puppet_slack_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'mxslk.as.tok') | to_uuid }}" | matrix_mx_puppet_slack_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'mxslk.as.tok') | to_uuid }}" | ||||||
| @@ -447,6 +461,8 @@ matrix_mx_puppet_twitter_systemd_required_services_list: | | |||||||
|     ['docker.service'] |     ['docker.service'] | ||||||
|     + |     + | ||||||
|     (['matrix-synapse.service'] if matrix_synapse_enabled else []) |     (['matrix-synapse.service'] if matrix_synapse_enabled else []) | ||||||
|  |     + | ||||||
|  |     (['matrix-postgres.service'] if matrix_postgres_enabled else []) | ||||||
|   }} |   }} | ||||||
|  |  | ||||||
| matrix_mx_puppet_twitter_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'mxtwt.as.tok') | to_uuid }}" | matrix_mx_puppet_twitter_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'mxtwt.as.tok') | to_uuid }}" | ||||||
| @@ -484,6 +500,8 @@ matrix_mx_puppet_instagram_systemd_required_services_list: | | |||||||
|     ['docker.service'] |     ['docker.service'] | ||||||
|     + |     + | ||||||
|     (['matrix-synapse.service'] if matrix_synapse_enabled else []) |     (['matrix-synapse.service'] if matrix_synapse_enabled else []) | ||||||
|  |     + | ||||||
|  |     (['matrix-postgres.service'] if matrix_postgres_enabled else []) | ||||||
|   }} |   }} | ||||||
|  |  | ||||||
| matrix_mx_puppet_instagram_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'mxig.as.tok') | to_uuid }}" | matrix_mx_puppet_instagram_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'mxig.as.tok') | to_uuid }}" | ||||||
| @@ -518,6 +536,8 @@ matrix_mx_puppet_discord_systemd_required_services_list: | | |||||||
|     ['docker.service'] |     ['docker.service'] | ||||||
|     + |     + | ||||||
|     (['matrix-synapse.service'] if matrix_synapse_enabled else []) |     (['matrix-synapse.service'] if matrix_synapse_enabled else []) | ||||||
|  |     + | ||||||
|  |     (['matrix-postgres.service'] if matrix_postgres_enabled else []) | ||||||
|   }} |   }} | ||||||
|  |  | ||||||
| matrix_mx_puppet_discord_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'mxdsc.as.tok') | to_uuid }}" | matrix_mx_puppet_discord_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'mxdsc.as.tok') | to_uuid }}" | ||||||
| @@ -552,6 +572,8 @@ matrix_mx_puppet_steam_systemd_required_services_list: | | |||||||
|     ['docker.service'] |     ['docker.service'] | ||||||
|     + |     + | ||||||
|     (['matrix-synapse.service'] if matrix_synapse_enabled else []) |     (['matrix-synapse.service'] if matrix_synapse_enabled else []) | ||||||
|  |     + | ||||||
|  |     (['matrix-postgres.service'] if matrix_postgres_enabled else []) | ||||||
|   }} |   }} | ||||||
|  |  | ||||||
| matrix_mx_puppet_steam_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'mxste.as.tok') | to_uuid }}" | matrix_mx_puppet_steam_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'mxste.as.tok') | to_uuid }}" | ||||||
| @@ -580,6 +602,13 @@ matrix_mx_puppet_steam_database_password: "{{ matrix_synapse_macaroon_secret_key | |||||||
| # We don't enable bots by default. | # We don't enable bots by default. | ||||||
| matrix_bot_matrix_reminder_bot_enabled: false | matrix_bot_matrix_reminder_bot_enabled: false | ||||||
|  |  | ||||||
|  | matrix_bot_matrix_reminder_bot_systemd_required_services_list: | | ||||||
|  |   {{ | ||||||
|  |     ['docker.service'] | ||||||
|  |     + | ||||||
|  |     (['matrix-postgres.service'] if matrix_postgres_enabled else []) | ||||||
|  |   }} | ||||||
|  |  | ||||||
| # Postgres is the default, except if not using `matrix_postgres` (internal postgres) | # Postgres is the default, except if not using `matrix_postgres` (internal postgres) | ||||||
| matrix_bot_matrix_reminder_bot_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}" | matrix_bot_matrix_reminder_bot_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}" | ||||||
| matrix_bot_matrix_reminder_bot_database_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'reminder.bot.db') | to_uuid }}" | matrix_bot_matrix_reminder_bot_database_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'reminder.bot.db') | to_uuid }}" | ||||||
| @@ -678,6 +707,13 @@ matrix_dimension_container_http_host_bind_port: "{{ '' if matrix_nginx_proxy_ena | |||||||
| matrix_integration_manager_rest_url: "{{ matrix_dimension_integrations_rest_url if matrix_dimension_enabled else None }}" | matrix_integration_manager_rest_url: "{{ matrix_dimension_integrations_rest_url if matrix_dimension_enabled else None }}" | ||||||
| matrix_integration_manager_ui_url: "{{ matrix_dimension_integrations_ui_url if matrix_dimension_enabled else None }}" | matrix_integration_manager_ui_url: "{{ matrix_dimension_integrations_ui_url if matrix_dimension_enabled else None }}" | ||||||
|  |  | ||||||
|  | matrix_dimension_systemd_required_services_list: | | ||||||
|  |   {{ | ||||||
|  |     ['docker.service'] | ||||||
|  |     + | ||||||
|  |     (['matrix-postgres.service'] if matrix_postgres_enabled else []) | ||||||
|  |   }} | ||||||
|  |  | ||||||
| # Postgres is the default, except if not using `matrix_postgres` (internal postgres) | # Postgres is the default, except if not using `matrix_postgres` (internal postgres) | ||||||
| matrix_dimension_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}" | matrix_dimension_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}" | ||||||
| matrix_dimension_database_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.dimension.db') | to_uuid }}" | matrix_dimension_database_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.dimension.db') | to_uuid }}" | ||||||
| @@ -826,6 +862,11 @@ matrix_ma1sd_threepid_medium_email_connectors_smtp_tls: 0 | |||||||
|  |  | ||||||
| matrix_ma1sd_self_check_validate_certificates: "{{ false if matrix_ssl_retrieval_method == 'self-signed' else true }}" | matrix_ma1sd_self_check_validate_certificates: "{{ false if matrix_ssl_retrieval_method == 'self-signed' else true }}" | ||||||
|  |  | ||||||
|  | matrix_ma1sd_systemd_required_services_list: | | ||||||
|  |   {{ | ||||||
|  |     (['matrix-postgres.service'] if matrix_postgres_enabled else []) | ||||||
|  |   }} | ||||||
|  |  | ||||||
| matrix_ma1sd_systemd_wanted_services_list: | | matrix_ma1sd_systemd_wanted_services_list: | | ||||||
|   {{ |   {{ | ||||||
|     (['matrix-corporal.service'] if matrix_corporal_enabled else ['matrix-synapse.service']) |     (['matrix-corporal.service'] if matrix_corporal_enabled else ['matrix-synapse.service']) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user