This is backward-compatible with what we had before. We're not changing the SSL mode - just making it configurable. Most components are defaulting to `sslmode=disable`, while some (`matrix-bot-matrix-reminder-bot` and others) do not specify an `sslmode` at all. We're making sslmode configurable, because certain external Postgres servers may be configured to require SSL encryption. In such cases `sslmode=disable` does not work and needs to be changed to `sslmode=require` or something else (`verify-ca`, `verify-full`, etc).pull/2842/head
| @@ -108,8 +108,9 @@ matrix_bot_buscarron_database_password: 'some-password' | |||||
| matrix_bot_buscarron_database_hostname: '' | matrix_bot_buscarron_database_hostname: '' | ||||
| matrix_bot_buscarron_database_port: 5432 | matrix_bot_buscarron_database_port: 5432 | ||||
| matrix_bot_buscarron_database_name: 'buscarron' | matrix_bot_buscarron_database_name: 'buscarron' | ||||
| matrix_bot_buscarron_database_sslmode: disable | |||||
| matrix_bot_buscarron_database_connection_string: 'postgres://{{ matrix_bot_buscarron_database_username }}:{{ matrix_bot_buscarron_database_password }}@{{ matrix_bot_buscarron_database_hostname }}:{{ matrix_bot_buscarron_database_port }}/{{ matrix_bot_buscarron_database_name }}?sslmode=disable' | |||||
| matrix_bot_buscarron_database_connection_string: 'postgres://{{ matrix_bot_buscarron_database_username }}:{{ matrix_bot_buscarron_database_password }}@{{ matrix_bot_buscarron_database_hostname }}:{{ matrix_bot_buscarron_database_port }}/{{ matrix_bot_buscarron_database_name }}?sslmode={{ matrix_bot_buscarron_database_sslmode }}' | |||||
| matrix_bot_buscarron_storage_database: "{{ | matrix_bot_buscarron_storage_database: "{{ | ||||
| { | { | ||||
| @@ -105,8 +105,9 @@ matrix_bot_honoroit_database_password: 'some-password' | |||||
| matrix_bot_honoroit_database_hostname: '' | matrix_bot_honoroit_database_hostname: '' | ||||
| matrix_bot_honoroit_database_port: 5432 | matrix_bot_honoroit_database_port: 5432 | ||||
| matrix_bot_honoroit_database_name: 'honoroit' | matrix_bot_honoroit_database_name: 'honoroit' | ||||
| matrix_bot_honoroit_database_sslmode: disable | |||||
| matrix_bot_honoroit_database_connection_string: 'postgres://{{ matrix_bot_honoroit_database_username }}:{{ matrix_bot_honoroit_database_password }}@{{ matrix_bot_honoroit_database_hostname }}:{{ matrix_bot_honoroit_database_port }}/{{ matrix_bot_honoroit_database_name }}?sslmode=disable' | |||||
| matrix_bot_honoroit_database_connection_string: 'postgres://{{ matrix_bot_honoroit_database_username }}:{{ matrix_bot_honoroit_database_password }}@{{ matrix_bot_honoroit_database_hostname }}:{{ matrix_bot_honoroit_database_port }}/{{ matrix_bot_honoroit_database_name }}?sslmode={{ matrix_bot_honoroit_database_sslmode }}' | |||||
| matrix_bot_honoroit_storage_database: "{{ | matrix_bot_honoroit_storage_database: "{{ | ||||
| { | { | ||||
| @@ -31,8 +31,9 @@ matrix_bot_maubot_database_password: ~ | |||||
| matrix_bot_maubot_database_hostname: '' | matrix_bot_maubot_database_hostname: '' | ||||
| matrix_bot_maubot_database_port: 5432 | matrix_bot_maubot_database_port: 5432 | ||||
| matrix_bot_maubot_database_name: matrix_bot_maubot | matrix_bot_maubot_database_name: matrix_bot_maubot | ||||
| matrix_bot_maubot_database_sslmode: disable | |||||
| matrix_bot_maubot_database_connection_string: postgres://{{ matrix_bot_maubot_database_username }}:{{ matrix_bot_maubot_database_password }}@{{ matrix_bot_maubot_database_hostname }}:{{ matrix_bot_maubot_database_port }}/{{ matrix_bot_maubot_database_name }}?sslmode=disable | |||||
| matrix_bot_maubot_database_connection_string: postgres://{{ matrix_bot_maubot_database_username }}:{{ matrix_bot_maubot_database_password }}@{{ matrix_bot_maubot_database_hostname }}:{{ matrix_bot_maubot_database_port }}/{{ matrix_bot_maubot_database_name }}?sslmode={{ matrix_bot_maubot_database_sslmode }} | |||||
| matrix_bot_maubot_database_uri: "{{ | matrix_bot_maubot_database_uri: "{{ | ||||
| { | { | ||||
| @@ -45,8 +45,9 @@ matrix_bot_postmoogle_database_password: 'some-password' | |||||
| matrix_bot_postmoogle_database_hostname: '' | matrix_bot_postmoogle_database_hostname: '' | ||||
| matrix_bot_postmoogle_database_port: 5432 | matrix_bot_postmoogle_database_port: 5432 | ||||
| matrix_bot_postmoogle_database_name: 'postmoogle' | matrix_bot_postmoogle_database_name: 'postmoogle' | ||||
| matrix_bot_postmoogle_database_sslmode: disable | |||||
| matrix_bot_postmoogle_database_connection_string: 'postgres://{{ matrix_bot_postmoogle_database_username }}:{{ matrix_bot_postmoogle_database_password }}@{{ matrix_bot_postmoogle_database_hostname }}:{{ matrix_bot_postmoogle_database_port }}/{{ matrix_bot_postmoogle_database_name }}?sslmode=disable' | |||||
| matrix_bot_postmoogle_database_connection_string: 'postgres://{{ matrix_bot_postmoogle_database_username }}:{{ matrix_bot_postmoogle_database_password }}@{{ matrix_bot_postmoogle_database_hostname }}:{{ matrix_bot_postmoogle_database_port }}/{{ matrix_bot_postmoogle_database_name }}?sslmode={{ matrix_bot_postmoogle_database_sslmode }}' | |||||
| matrix_bot_postmoogle_storage_database: "{{ | matrix_bot_postmoogle_storage_database: "{{ | ||||
| { | { | ||||
| @@ -33,10 +33,11 @@ matrix_appservice_irc_database_password: 'some-password' | |||||
| matrix_appservice_irc_database_hostname: '' | matrix_appservice_irc_database_hostname: '' | ||||
| matrix_appservice_irc_database_port: 5432 | matrix_appservice_irc_database_port: 5432 | ||||
| matrix_appservice_irc_database_name: matrix_appservice_irc | matrix_appservice_irc_database_name: matrix_appservice_irc | ||||
| matrix_appservice_irc_database_sslmode: disable | |||||
| # This is just the Postgres connection string, if Postgres is used. | # This is just the Postgres connection string, if Postgres is used. | ||||
| # Naming clashes with `matrix_appservice_irc_database_connectionString` somewhat. | # Naming clashes with `matrix_appservice_irc_database_connectionString` somewhat. | ||||
| matrix_appservice_irc_database_connection_string: 'postgresql://{{ matrix_appservice_irc_database_username }}:{{ matrix_appservice_irc_database_password }}@{{ matrix_appservice_irc_database_hostname }}:{{ matrix_appservice_irc_database_port }}/{{ matrix_appservice_irc_database_name }}?sslmode=disable' | |||||
| matrix_appservice_irc_database_connection_string: 'postgresql://{{ matrix_appservice_irc_database_username }}:{{ matrix_appservice_irc_database_password }}@{{ matrix_appservice_irc_database_hostname }}:{{ matrix_appservice_irc_database_port }}/{{ matrix_appservice_irc_database_name }}?sslmode={{ matrix_appservice_irc_database_sslmode }}' | |||||
| # This is what actually goes into `database.connectionString` for the bridge. | # This is what actually goes into `database.connectionString` for the bridge. | ||||
| matrix_appservice_irc_database_connectionString: |- # noqa var-naming | matrix_appservice_irc_database_connectionString: |- # noqa var-naming | ||||
| @@ -61,10 +61,11 @@ matrix_appservice_slack_database_password: 'some-passsword' | |||||
| matrix_appservice_slack_database_hostname: '' | matrix_appservice_slack_database_hostname: '' | ||||
| matrix_appservice_slack_database_port: 5432 | matrix_appservice_slack_database_port: 5432 | ||||
| matrix_appservice_slack_database_name: matrix_appservice_slack | matrix_appservice_slack_database_name: matrix_appservice_slack | ||||
| matrix_appservice_slack_database_sslmode: disable | |||||
| # This is just the Postgres connection string, if Postgres is used. | # This is just the Postgres connection string, if Postgres is used. | ||||
| # Naming clashes with `matrix_appservice_slack_database_connectionString` somewhat. | # Naming clashes with `matrix_appservice_slack_database_connectionString` somewhat. | ||||
| matrix_appservice_slack_database_connection_string: 'postgresql://{{ matrix_appservice_slack_database_username }}:{{ matrix_appservice_slack_database_password }}@{{ matrix_appservice_slack_database_hostname }}:{{ matrix_appservice_slack_database_port }}/{{ matrix_appservice_slack_database_name }}?sslmode=disable' | |||||
| matrix_appservice_slack_database_connection_string: 'postgresql://{{ matrix_appservice_slack_database_username }}:{{ matrix_appservice_slack_database_password }}@{{ matrix_appservice_slack_database_hostname }}:{{ matrix_appservice_slack_database_port }}/{{ matrix_appservice_slack_database_name }}?sslmode={{ matrix_appservice_slack_database_sslmode }}' | |||||
| # This is what actually goes into `database.connectionString` for the bridge. | # This is what actually goes into `database.connectionString` for the bridge. | ||||
| matrix_appservice_slack_database_connectionString: |- # noqa var-naming | matrix_appservice_slack_database_connectionString: |- # noqa var-naming | ||||
| @@ -61,8 +61,9 @@ matrix_beeper_linkedin_database_password: 'some-password' | |||||
| matrix_beeper_linkedin_database_hostname: '' | matrix_beeper_linkedin_database_hostname: '' | ||||
| matrix_beeper_linkedin_database_port: 5432 | matrix_beeper_linkedin_database_port: 5432 | ||||
| matrix_beeper_linkedin_database_name: 'matrix_beeper_linkedin' | matrix_beeper_linkedin_database_name: 'matrix_beeper_linkedin' | ||||
| matrix_beeper_linkedin_database_sslmode: disable | |||||
| matrix_beeper_linkedin_database_connection_string: 'postgresql://{{ matrix_beeper_linkedin_database_username }}:{{ matrix_beeper_linkedin_database_password }}@{{ matrix_beeper_linkedin_database_hostname }}:{{ matrix_beeper_linkedin_database_port }}/{{ matrix_beeper_linkedin_database_name }}?sslmode=disable' | |||||
| matrix_beeper_linkedin_database_connection_string: 'postgresql://{{ matrix_beeper_linkedin_database_username }}:{{ matrix_beeper_linkedin_database_password }}@{{ matrix_beeper_linkedin_database_hostname }}:{{ matrix_beeper_linkedin_database_port }}/{{ matrix_beeper_linkedin_database_name }}?sslmode={{ matrix_beeper_linkedin_database_sslmode }}' | |||||
| matrix_beeper_linkedin_appservice_database_type: "{{ | matrix_beeper_linkedin_appservice_database_type: "{{ | ||||
| { | { | ||||
| @@ -59,8 +59,9 @@ matrix_go_skype_bridge_database_password: 'some-password' | |||||
| matrix_go_skype_bridge_database_hostname: '' | matrix_go_skype_bridge_database_hostname: '' | ||||
| matrix_go_skype_bridge_database_port: 5432 | matrix_go_skype_bridge_database_port: 5432 | ||||
| matrix_go_skype_bridge_database_name: 'matrix_go_skype_bridge' | matrix_go_skype_bridge_database_name: 'matrix_go_skype_bridge' | ||||
| matrix_go_skype_bridge_database_sslmode: disable | |||||
| matrix_go_skype_bridge_database_connection_string: 'postgresql://{{ matrix_go_skype_bridge_database_username }}:{{ matrix_go_skype_bridge_database_password }}@{{ matrix_go_skype_bridge_database_hostname }}:{{ matrix_go_skype_bridge_database_port }}/{{ matrix_go_skype_bridge_database_name }}?sslmode=disable' | |||||
| matrix_go_skype_bridge_database_connection_string: 'postgresql://{{ matrix_go_skype_bridge_database_username }}:{{ matrix_go_skype_bridge_database_password }}@{{ matrix_go_skype_bridge_database_hostname }}:{{ matrix_go_skype_bridge_database_port }}/{{ matrix_go_skype_bridge_database_name }}?sslmode={{ matrix_go_skype_bridge_database_sslmode }}' | |||||
| matrix_go_skype_bridge_appservice_database_type: "{{ | matrix_go_skype_bridge_appservice_database_type: "{{ | ||||
| { | { | ||||
| @@ -70,8 +70,9 @@ matrix_mautrix_discord_database_password: 'some-password' | |||||
| matrix_mautrix_discord_database_hostname: '' | matrix_mautrix_discord_database_hostname: '' | ||||
| matrix_mautrix_discord_database_port: 5432 | matrix_mautrix_discord_database_port: 5432 | ||||
| matrix_mautrix_discord_database_name: 'matrix_mautrix_discord' | matrix_mautrix_discord_database_name: 'matrix_mautrix_discord' | ||||
| matrix_mautrix_discord_database_sslmode: disable | |||||
| matrix_mautrix_discord_database_connection_string: 'postgresql://{{ matrix_mautrix_discord_database_username }}:{{ matrix_mautrix_discord_database_password }}@{{ matrix_mautrix_discord_database_hostname }}:{{ matrix_mautrix_discord_database_port }}/{{ matrix_mautrix_discord_database_name }}?sslmode=disable' | |||||
| matrix_mautrix_discord_database_connection_string: 'postgresql://{{ matrix_mautrix_discord_database_username }}:{{ matrix_mautrix_discord_database_password }}@{{ matrix_mautrix_discord_database_hostname }}:{{ matrix_mautrix_discord_database_port }}/{{ matrix_mautrix_discord_database_name }}?sslmode={{ matrix_mautrix_discord_database_sslmode }}' | |||||
| matrix_mautrix_discord_appservice_database_type: "{{ | matrix_mautrix_discord_appservice_database_type: "{{ | ||||
| { | { | ||||
| @@ -74,8 +74,9 @@ matrix_mautrix_gmessages_database_password: 'some-password' | |||||
| matrix_mautrix_gmessages_database_hostname: '' | matrix_mautrix_gmessages_database_hostname: '' | ||||
| matrix_mautrix_gmessages_database_port: 5432 | matrix_mautrix_gmessages_database_port: 5432 | ||||
| matrix_mautrix_gmessages_database_name: 'matrix_mautrix_gmessages' | matrix_mautrix_gmessages_database_name: 'matrix_mautrix_gmessages' | ||||
| matrix_mautrix_gmessages_database_sslmode: disable | |||||
| matrix_mautrix_gmessages_database_connection_string: 'postgresql://{{ matrix_mautrix_gmessages_database_username }}:{{ matrix_mautrix_gmessages_database_password }}@{{ matrix_mautrix_gmessages_database_hostname }}:{{ matrix_mautrix_gmessages_database_port }}/{{ matrix_mautrix_gmessages_database_name }}?sslmode=disable' | |||||
| matrix_mautrix_gmessages_database_connection_string: 'postgresql://{{ matrix_mautrix_gmessages_database_username }}:{{ matrix_mautrix_gmessages_database_password }}@{{ matrix_mautrix_gmessages_database_hostname }}:{{ matrix_mautrix_gmessages_database_port }}/{{ matrix_mautrix_gmessages_database_name }}?sslmode={{ matrix_mautrix_gmessages_database_sslmode }}' | |||||
| matrix_mautrix_gmessages_appservice_database_type: "{{ | matrix_mautrix_gmessages_appservice_database_type: "{{ | ||||
| { | { | ||||
| @@ -66,8 +66,9 @@ matrix_mautrix_slack_database_password: 'some-password' | |||||
| matrix_mautrix_slack_database_hostname: '' | matrix_mautrix_slack_database_hostname: '' | ||||
| matrix_mautrix_slack_database_port: 5432 | matrix_mautrix_slack_database_port: 5432 | ||||
| matrix_mautrix_slack_database_name: 'matrix_mautrix_slack' | matrix_mautrix_slack_database_name: 'matrix_mautrix_slack' | ||||
| matrix_mautrix_slack_database_sslmode: disable | |||||
| matrix_mautrix_slack_database_connection_string: 'postgresql://{{ matrix_mautrix_slack_database_username }}:{{ matrix_mautrix_slack_database_password }}@{{ matrix_mautrix_slack_database_hostname }}:{{ matrix_mautrix_slack_database_port }}/{{ matrix_mautrix_slack_database_name }}?sslmode=disable' | |||||
| matrix_mautrix_slack_database_connection_string: 'postgresql://{{ matrix_mautrix_slack_database_username }}:{{ matrix_mautrix_slack_database_password }}@{{ matrix_mautrix_slack_database_hostname }}:{{ matrix_mautrix_slack_database_port }}/{{ matrix_mautrix_slack_database_name }}?sslmode={{ matrix_mautrix_slack_database_sslmode }}' | |||||
| matrix_mautrix_slack_appservice_database_type: "{{ | matrix_mautrix_slack_appservice_database_type: "{{ | ||||
| { | { | ||||
| @@ -74,8 +74,9 @@ matrix_mautrix_whatsapp_database_password: 'some-password' | |||||
| matrix_mautrix_whatsapp_database_hostname: '' | matrix_mautrix_whatsapp_database_hostname: '' | ||||
| matrix_mautrix_whatsapp_database_port: 5432 | matrix_mautrix_whatsapp_database_port: 5432 | ||||
| matrix_mautrix_whatsapp_database_name: 'matrix_mautrix_whatsapp' | matrix_mautrix_whatsapp_database_name: 'matrix_mautrix_whatsapp' | ||||
| matrix_mautrix_whatsapp_database_sslmode: disable | |||||
| matrix_mautrix_whatsapp_database_connection_string: 'postgresql://{{ matrix_mautrix_whatsapp_database_username }}:{{ matrix_mautrix_whatsapp_database_password }}@{{ matrix_mautrix_whatsapp_database_hostname }}:{{ matrix_mautrix_whatsapp_database_port }}/{{ matrix_mautrix_whatsapp_database_name }}?sslmode=disable' | |||||
| matrix_mautrix_whatsapp_database_connection_string: 'postgresql://{{ matrix_mautrix_whatsapp_database_username }}:{{ matrix_mautrix_whatsapp_database_password }}@{{ matrix_mautrix_whatsapp_database_hostname }}:{{ matrix_mautrix_whatsapp_database_port }}/{{ matrix_mautrix_whatsapp_database_name }}?sslmode={{ matrix_mautrix_whatsapp_database_sslmode }}' | |||||
| matrix_mautrix_whatsapp_appservice_database_type: "{{ | matrix_mautrix_whatsapp_appservice_database_type: "{{ | ||||
| { | { | ||||
| @@ -69,8 +69,9 @@ matrix_mx_puppet_discord_database_password: ~ | |||||
| matrix_mx_puppet_discord_database_hostname: '' | matrix_mx_puppet_discord_database_hostname: '' | ||||
| matrix_mx_puppet_discord_database_port: 5432 | matrix_mx_puppet_discord_database_port: 5432 | ||||
| matrix_mx_puppet_discord_database_name: matrix_mx_puppet_discord | matrix_mx_puppet_discord_database_name: matrix_mx_puppet_discord | ||||
| matrix_mx_puppet_discord_database_sslmode: disable | |||||
| matrix_mx_puppet_discord_database_connection_string: 'postgresql://{{ matrix_mx_puppet_discord_database_username }}:{{ matrix_mx_puppet_discord_database_password }}@{{ matrix_mx_puppet_discord_database_hostname }}:{{ matrix_mx_puppet_discord_database_port }}/{{ matrix_mx_puppet_discord_database_name }}?sslmode=disable' | |||||
| matrix_mx_puppet_discord_database_connection_string: 'postgresql://{{ matrix_mx_puppet_discord_database_username }}:{{ matrix_mx_puppet_discord_database_password }}@{{ matrix_mx_puppet_discord_database_hostname }}:{{ matrix_mx_puppet_discord_database_port }}/{{ matrix_mx_puppet_discord_database_name }}?sslmode={{ matrix_mx_puppet_discord_database_sslmode }}' | |||||
| # Default configuration template which covers the generic use case. | # Default configuration template which covers the generic use case. | ||||
| # You can customize it by controlling the various variables inside it. | # You can customize it by controlling the various variables inside it. | ||||
| @@ -65,8 +65,9 @@ matrix_mx_puppet_groupme_database_password: ~ | |||||
| matrix_mx_puppet_groupme_database_hostname: '' | matrix_mx_puppet_groupme_database_hostname: '' | ||||
| matrix_mx_puppet_groupme_database_port: 5432 | matrix_mx_puppet_groupme_database_port: 5432 | ||||
| matrix_mx_puppet_groupme_database_name: matrix_mx_puppet_groupme | matrix_mx_puppet_groupme_database_name: matrix_mx_puppet_groupme | ||||
| matrix_mx_puppet_groupme_database_sslmode: disable | |||||
| matrix_mx_puppet_groupme_database_connection_string: 'postgresql://{{ matrix_mx_puppet_groupme_database_username }}:{{ matrix_mx_puppet_groupme_database_password }}@{{ matrix_mx_puppet_groupme_database_hostname }}:{{ matrix_mx_puppet_groupme_database_port }}/{{ matrix_mx_puppet_groupme_database_name }}?sslmode=disable' | |||||
| matrix_mx_puppet_groupme_database_connection_string: 'postgresql://{{ matrix_mx_puppet_groupme_database_username }}:{{ matrix_mx_puppet_groupme_database_password }}@{{ matrix_mx_puppet_groupme_database_hostname }}:{{ matrix_mx_puppet_groupme_database_port }}/{{ matrix_mx_puppet_groupme_database_name }}?sslmode={{ matrix_mx_puppet_groupme_database_sslmode }}' | |||||
| # Default configuration template which covers the generic use case. | # Default configuration template which covers the generic use case. | ||||
| # You can customize it by controlling the various variables inside it. | # You can customize it by controlling the various variables inside it. | ||||
| @@ -59,8 +59,9 @@ matrix_mx_puppet_instagram_database_password: ~ | |||||
| matrix_mx_puppet_instagram_database_hostname: '' | matrix_mx_puppet_instagram_database_hostname: '' | ||||
| matrix_mx_puppet_instagram_database_port: 5432 | matrix_mx_puppet_instagram_database_port: 5432 | ||||
| matrix_mx_puppet_instagram_database_name: matrix_mx_puppet_instagram | matrix_mx_puppet_instagram_database_name: matrix_mx_puppet_instagram | ||||
| matrix_mx_puppet_instagram_database_sslmode: disable | |||||
| matrix_mx_puppet_instagram_database_connection_string: 'postgresql://{{ matrix_mx_puppet_instagram_database_username }}:{{ matrix_mx_puppet_instagram_database_password }}@{{ matrix_mx_puppet_instagram_database_hostname }}:{{ matrix_mx_puppet_instagram_database_port }}/{{ matrix_mx_puppet_instagram_database_name }}?sslmode=disable' | |||||
| matrix_mx_puppet_instagram_database_connection_string: 'postgresql://{{ matrix_mx_puppet_instagram_database_username }}:{{ matrix_mx_puppet_instagram_database_password }}@{{ matrix_mx_puppet_instagram_database_hostname }}:{{ matrix_mx_puppet_instagram_database_port }}/{{ matrix_mx_puppet_instagram_database_name }}?sslmode={{ matrix_mx_puppet_instagram_database_sslmode }}' | |||||
| # Default configuration template which covers the generic use case. | # Default configuration template which covers the generic use case. | ||||
| # You can customize it by controlling the various variables inside it. | # You can customize it by controlling the various variables inside it. | ||||
| @@ -73,8 +73,9 @@ matrix_mx_puppet_slack_database_password: ~ | |||||
| matrix_mx_puppet_slack_database_hostname: '' | matrix_mx_puppet_slack_database_hostname: '' | ||||
| matrix_mx_puppet_slack_database_port: 5432 | matrix_mx_puppet_slack_database_port: 5432 | ||||
| matrix_mx_puppet_slack_database_name: matrix_mx_puppet_slack | matrix_mx_puppet_slack_database_name: matrix_mx_puppet_slack | ||||
| matrix_mx_puppet_slack_database_sslmode: disable | |||||
| matrix_mx_puppet_slack_database_connection_string: 'postgresql://{{ matrix_mx_puppet_slack_database_username }}:{{ matrix_mx_puppet_slack_database_password }}@{{ matrix_mx_puppet_slack_database_hostname }}:{{ matrix_mx_puppet_slack_database_port }}/{{ matrix_mx_puppet_slack_database_name }}?sslmode=disable' | |||||
| matrix_mx_puppet_slack_database_connection_string: 'postgresql://{{ matrix_mx_puppet_slack_database_username }}:{{ matrix_mx_puppet_slack_database_password }}@{{ matrix_mx_puppet_slack_database_hostname }}:{{ matrix_mx_puppet_slack_database_port }}/{{ matrix_mx_puppet_slack_database_name }}?sslmode={{ matrix_mx_puppet_slack_database_sslmode }}' | |||||
| # Default configuration template which covers the generic use case. | # Default configuration template which covers the generic use case. | ||||
| # You can customize it by controlling the various variables inside it. | # You can customize it by controlling the various variables inside it. | ||||
| @@ -65,8 +65,9 @@ matrix_mx_puppet_steam_database_password: ~ | |||||
| matrix_mx_puppet_steam_database_hostname: '' | matrix_mx_puppet_steam_database_hostname: '' | ||||
| matrix_mx_puppet_steam_database_port: 5432 | matrix_mx_puppet_steam_database_port: 5432 | ||||
| matrix_mx_puppet_steam_database_name: matrix_mx_puppet_steam | matrix_mx_puppet_steam_database_name: matrix_mx_puppet_steam | ||||
| matrix_mx_puppet_steam_database_sslmode: disable | |||||
| matrix_mx_puppet_steam_database_connection_string: 'postgresql://{{ matrix_mx_puppet_steam_database_username }}:{{ matrix_mx_puppet_steam_database_password }}@{{ matrix_mx_puppet_steam_database_hostname }}:{{ matrix_mx_puppet_steam_database_port }}/{{ matrix_mx_puppet_steam_database_name }}?sslmode=disable' | |||||
| matrix_mx_puppet_steam_database_connection_string: 'postgresql://{{ matrix_mx_puppet_steam_database_username }}:{{ matrix_mx_puppet_steam_database_password }}@{{ matrix_mx_puppet_steam_database_hostname }}:{{ matrix_mx_puppet_steam_database_port }}/{{ matrix_mx_puppet_steam_database_name }}?sslmode={{ matrix_mx_puppet_steam_database_sslmode }}' | |||||
| # Default configuration template which covers the generic use case. | # Default configuration template which covers the generic use case. | ||||
| # You can customize it by controlling the various variables inside it. | # You can customize it by controlling the various variables inside it. | ||||
| @@ -74,8 +74,9 @@ matrix_mx_puppet_twitter_database_password: ~ | |||||
| matrix_mx_puppet_twitter_database_hostname: '' | matrix_mx_puppet_twitter_database_hostname: '' | ||||
| matrix_mx_puppet_twitter_database_port: 5432 | matrix_mx_puppet_twitter_database_port: 5432 | ||||
| matrix_mx_puppet_twitter_database_name: matrix_mx_puppet_twitter | matrix_mx_puppet_twitter_database_name: matrix_mx_puppet_twitter | ||||
| matrix_mx_puppet_twitter_database_sslmode: disable | |||||
| matrix_mx_puppet_twitter_database_connection_string: 'postgresql://{{ matrix_mx_puppet_twitter_database_username }}:{{ matrix_mx_puppet_twitter_database_password }}@{{ matrix_mx_puppet_twitter_database_hostname }}:{{ matrix_mx_puppet_twitter_database_port }}/{{ matrix_mx_puppet_twitter_database_name }}?sslmode=disable' | |||||
| matrix_mx_puppet_twitter_database_connection_string: 'postgresql://{{ matrix_mx_puppet_twitter_database_username }}:{{ matrix_mx_puppet_twitter_database_password }}@{{ matrix_mx_puppet_twitter_database_hostname }}:{{ matrix_mx_puppet_twitter_database_port }}/{{ matrix_mx_puppet_twitter_database_name }}?sslmode={{ matrix_mx_puppet_twitter_database_sslmode }}' | |||||
| # Default configuration template which covers the generic use case. | # Default configuration template which covers the generic use case. | ||||
| # You can customize it by controlling the various variables inside it. | # You can customize it by controlling the various variables inside it. | ||||
| @@ -156,6 +156,7 @@ matrix_dendrite_database_str: "postgresql://{{ matrix_dendrite_database_user }}: | |||||
| matrix_dendrite_database_hostname: "" | matrix_dendrite_database_hostname: "" | ||||
| matrix_dendrite_database_user: "dendrite" | matrix_dendrite_database_user: "dendrite" | ||||
| matrix_dendrite_database_password: "itsasecret" | matrix_dendrite_database_password: "itsasecret" | ||||
| matrix_dendrite_database_sslmode: disable | |||||
| matrix_dendrite_federation_api_database: "dendrite_federationapi" | matrix_dendrite_federation_api_database: "dendrite_federationapi" | ||||
| matrix_dendrite_key_server_database: "dendrite_keyserver" | matrix_dendrite_key_server_database: "dendrite_keyserver" | ||||
| matrix_dendrite_media_api_database: "dendrite_mediaapi" | matrix_dendrite_media_api_database: "dendrite_mediaapi" | ||||
| @@ -223,7 +223,7 @@ federation_api: | |||||
| external_api: | external_api: | ||||
| listen: http://0.0.0.0:8072 | listen: http://0.0.0.0:8072 | ||||
| database: | database: | ||||
| connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_federation_api_database }}?sslmode=disable | |||||
| connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_federation_api_database }}?sslmode={{ matrix_dendrite_database_sslmode }} | |||||
| max_open_conns: 10 | max_open_conns: 10 | ||||
| max_idle_conns: 2 | max_idle_conns: 2 | ||||
| conn_max_lifetime: -1 | conn_max_lifetime: -1 | ||||
| @@ -266,7 +266,7 @@ key_server: | |||||
| listen: http://0.0.0.0:7779 | listen: http://0.0.0.0:7779 | ||||
| connect: http://key_server:7779 | connect: http://key_server:7779 | ||||
| database: | database: | ||||
| connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_key_server_database }}?sslmode=disable | |||||
| connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_key_server_database }}?sslmode={{ matrix_dendrite_database_sslmode }} | |||||
| max_open_conns: 10 | max_open_conns: 10 | ||||
| max_idle_conns: 2 | max_idle_conns: 2 | ||||
| conn_max_lifetime: -1 | conn_max_lifetime: -1 | ||||
| @@ -279,7 +279,7 @@ media_api: | |||||
| external_api: | external_api: | ||||
| listen: http://0.0.0.0:8074 | listen: http://0.0.0.0:8074 | ||||
| database: | database: | ||||
| connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_media_api_database }}?sslmode=disable | |||||
| connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_media_api_database }}?sslmode={{ matrix_dendrite_database_sslmode }} | |||||
| max_open_conns: 10 | max_open_conns: 10 | ||||
| max_idle_conns: 2 | max_idle_conns: 2 | ||||
| conn_max_lifetime: -1 | conn_max_lifetime: -1 | ||||
| @@ -318,7 +318,7 @@ mscs: | |||||
| # - msc2946 (Spaces Summary, see https://github.com/matrix-org/matrix-doc/pull/2946) | # - msc2946 (Spaces Summary, see https://github.com/matrix-org/matrix-doc/pull/2946) | ||||
| mscs: [] | mscs: [] | ||||
| database: | database: | ||||
| connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_mscs_database }}?sslmode=disable | |||||
| connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_mscs_database }}?sslmode={{ matrix_dendrite_database_sslmode }} | |||||
| max_open_conns: 5 | max_open_conns: 5 | ||||
| max_idle_conns: 2 | max_idle_conns: 2 | ||||
| conn_max_lifetime: -1 | conn_max_lifetime: -1 | ||||
| @@ -329,7 +329,7 @@ room_server: | |||||
| listen: http://0.0.0.0:7770 | listen: http://0.0.0.0:7770 | ||||
| connect: http://room_server:7770 | connect: http://room_server:7770 | ||||
| database: | database: | ||||
| connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_room_database }}?sslmode=disable | |||||
| connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_room_database }}?sslmode={{ matrix_dendrite_database_sslmode }} | |||||
| max_open_conns: 10 | max_open_conns: 10 | ||||
| max_idle_conns: 2 | max_idle_conns: 2 | ||||
| conn_max_lifetime: -1 | conn_max_lifetime: -1 | ||||
| @@ -342,7 +342,7 @@ sync_api: | |||||
| external_api: | external_api: | ||||
| listen: http://0.0.0.0:8073 | listen: http://0.0.0.0:8073 | ||||
| database: | database: | ||||
| connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_sync_api_database }}?sslmode=disable | |||||
| connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_sync_api_database }}?sslmode={{ matrix_dendrite_database_sslmode }} | |||||
| max_open_conns: 10 | max_open_conns: 10 | ||||
| max_idle_conns: 2 | max_idle_conns: 2 | ||||
| conn_max_lifetime: -1 | conn_max_lifetime: -1 | ||||
| @@ -376,7 +376,7 @@ user_api: | |||||
| listen: http://0.0.0.0:7781 | listen: http://0.0.0.0:7781 | ||||
| connect: http://user_api:7781 | connect: http://user_api:7781 | ||||
| account_database: | account_database: | ||||
| connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_user_api_database }}?sslmode=disable | |||||
| connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_user_api_database }}?sslmode={{ matrix_dendrite_database_sslmode }} | |||||
| max_open_conns: 10 | max_open_conns: 10 | ||||
| max_idle_conns: 2 | max_idle_conns: 2 | ||||
| conn_max_lifetime: -1 | conn_max_lifetime: -1 | ||||
| @@ -394,7 +394,7 @@ push_server: | |||||
| listen: http://localhost:7782 | listen: http://localhost:7782 | ||||
| connect: http://localhost:7782 | connect: http://localhost:7782 | ||||
| database: | database: | ||||
| connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_push_server_database }}?sslmode=disable | |||||
| connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_push_server_database }}?sslmode={{ matrix_dendrite_database_sslmode }} | |||||
| max_open_conns: 10 | max_open_conns: 10 | ||||
| max_idle_conns: 2 | max_idle_conns: 2 | ||||
| conn_max_lifetime: -1 | conn_max_lifetime: -1 | ||||
| @@ -403,7 +403,7 @@ push_server: | |||||
| # | # | ||||
| relay_api: | relay_api: | ||||
| database: | database: | ||||
| connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_relay_api_database }}?sslmode=disable | |||||
| connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_relay_api_database }}?sslmode={{ matrix_dendrite_database_sslmode }} | |||||
| # Configuration for Opentracing. | # Configuration for Opentracing. | ||||
| # See https://github.com/matrix-org/dendrite/tree/master/docs/tracing for information on | # See https://github.com/matrix-org/dendrite/tree/master/docs/tracing for information on | ||||
| @@ -112,9 +112,10 @@ matrix_media_repo_database_password: "your_password" | |||||
| matrix_media_repo_database_hostname: "{{ devture_postgres_identifier }}" | matrix_media_repo_database_hostname: "{{ devture_postgres_identifier }}" | ||||
| matrix_media_repo_database_port: 5432 | matrix_media_repo_database_port: 5432 | ||||
| matrix_media_repo_database_name: "matrix_media_repo" | matrix_media_repo_database_name: "matrix_media_repo" | ||||
| matrix_media_repo_database_sslmode: disable | |||||
| # Currently only "postgres" is supported. | # Currently only "postgres" is supported. | ||||
| matrix_media_repo_database_postgres: "postgres://{{ matrix_media_repo_database_username }}:{{ matrix_media_repo_database_password }}@{{ matrix_media_repo_database_hostname }}:{{ matrix_media_repo_database_port }}/{{ matrix_media_repo_database_name }}?sslmode=disable" | |||||
| matrix_media_repo_database_postgres: "postgres://{{ matrix_media_repo_database_username }}:{{ matrix_media_repo_database_password }}@{{ matrix_media_repo_database_hostname }}:{{ matrix_media_repo_database_port }}/{{ matrix_media_repo_database_name }}?sslmode={{ matrix_media_repo_database_sslmode }}" | |||||
| # The database pooling options | # The database pooling options | ||||
| @@ -82,10 +82,11 @@ matrix_sliding_sync_environment_variable_syncv3_server: "{{ matrix_homeserver_ur | |||||
| matrix_sliding_sync_environment_variable_syncv3_secret: '' | matrix_sliding_sync_environment_variable_syncv3_secret: '' | ||||
| # Controls the SYNCV3_DB environment variable | # Controls the SYNCV3_DB environment variable | ||||
| matrix_sliding_sync_environment_variable_syncv3_db: 'user={{ matrix_sliding_sync_database_username }} password={{ matrix_sliding_sync_database_password }} host={{ matrix_sliding_sync_database_hostname }} port={{ matrix_sliding_sync_database_port }} dbname={{ matrix_sliding_sync_database_name }} sslmode=disable' | |||||
| matrix_sliding_sync_environment_variable_syncv3_db: 'user={{ matrix_sliding_sync_database_username }} password={{ matrix_sliding_sync_database_password }} host={{ matrix_sliding_sync_database_hostname }} port={{ matrix_sliding_sync_database_port }} dbname={{ matrix_sliding_sync_database_name }} sslmode={{ matrix_sliding_sync_database_sslmode }}' | |||||
| matrix_sliding_sync_database_username: 'matrix_sliding_sync' | matrix_sliding_sync_database_username: 'matrix_sliding_sync' | ||||
| matrix_sliding_sync_database_password: '' | matrix_sliding_sync_database_password: '' | ||||
| matrix_sliding_sync_database_hostname: '' | matrix_sliding_sync_database_hostname: '' | ||||
| matrix_sliding_sync_database_port: 5432 | matrix_sliding_sync_database_port: 5432 | ||||
| matrix_sliding_sync_database_name: 'matrix_sliding_sync' | matrix_sliding_sync_database_name: 'matrix_sliding_sync' | ||||
| matrix_sliding_sync_database_sslmode: disable | |||||