Merge pull request #765 from Cadair/fix-db
Use role relative paths for references to matrix-postgres role
This commit is contained in:
commit
a284b6f452
|
@ -19,7 +19,7 @@
|
||||||
engine_old: 'sqlite'
|
engine_old: 'sqlite'
|
||||||
systemd_services_to_stop: ['matrix-bot-matrix-reminder-bot.service']
|
systemd_services_to_stop: ['matrix-bot-matrix-reminder-bot.service']
|
||||||
|
|
||||||
- import_tasks: "roles/matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
- import_tasks: "{{ role_path }}/../matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
||||||
|
|
||||||
- set_fact:
|
- set_fact:
|
||||||
matrix_bot_matrix_reminder_bot_requires_restart: true
|
matrix_bot_matrix_reminder_bot_requires_restart: true
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
engine_old: 'sqlite'
|
engine_old: 'sqlite'
|
||||||
systemd_services_to_stop: ['matrix-appservice-discord.service']
|
systemd_services_to_stop: ['matrix-appservice-discord.service']
|
||||||
|
|
||||||
- import_tasks: "roles/matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
- import_tasks: "{{ role_path }}/../matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
||||||
|
|
||||||
- set_fact:
|
- set_fact:
|
||||||
matrix_appservice_discord_requires_restart: true
|
matrix_appservice_discord_requires_restart: true
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
engine_old: 'sqlite'
|
engine_old: 'sqlite'
|
||||||
systemd_services_to_stop: ['matrix-mautrix-facebook.service']
|
systemd_services_to_stop: ['matrix-mautrix-facebook.service']
|
||||||
|
|
||||||
- import_tasks: "roles/matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
- import_tasks: "{{ role_path }}/../matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
||||||
|
|
||||||
- set_fact:
|
- set_fact:
|
||||||
matrix_mautrix_facebook_requires_restart: true
|
matrix_mautrix_facebook_requires_restart: true
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
engine_old: 'sqlite'
|
engine_old: 'sqlite'
|
||||||
systemd_services_to_stop: ['matrix-mautrix-hangouts.service']
|
systemd_services_to_stop: ['matrix-mautrix-hangouts.service']
|
||||||
|
|
||||||
- import_tasks: "roles/matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
- import_tasks: "{{ role_path }}/../matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
||||||
|
|
||||||
- set_fact:
|
- set_fact:
|
||||||
matrix_mautrix_hangouts_requires_restart: true
|
matrix_mautrix_hangouts_requires_restart: true
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
engine_old: 'sqlite'
|
engine_old: 'sqlite'
|
||||||
systemd_services_to_stop: ['matrix-mautrix-telegram.service']
|
systemd_services_to_stop: ['matrix-mautrix-telegram.service']
|
||||||
|
|
||||||
- import_tasks: "roles/matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
- import_tasks: "{{ role_path }}/../matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
||||||
|
|
||||||
- set_fact:
|
- set_fact:
|
||||||
matrix_mautrix_telegram_requires_restart: true
|
matrix_mautrix_telegram_requires_restart: true
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
engine_old: 'sqlite'
|
engine_old: 'sqlite'
|
||||||
systemd_services_to_stop: ['matrix-mautrix-whatsapp.service']
|
systemd_services_to_stop: ['matrix-mautrix-whatsapp.service']
|
||||||
|
|
||||||
- import_tasks: "roles/matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
- import_tasks: "{{ role_path }}/../matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
||||||
|
|
||||||
- set_fact:
|
- set_fact:
|
||||||
matrix_mautrix_whatsapp_requires_restart: true
|
matrix_mautrix_whatsapp_requires_restart: true
|
||||||
|
|
|
@ -58,7 +58,7 @@
|
||||||
engine_old: 'sqlite'
|
engine_old: 'sqlite'
|
||||||
systemd_services_to_stop: ['matrix-mx-puppet-discord.service']
|
systemd_services_to_stop: ['matrix-mx-puppet-discord.service']
|
||||||
|
|
||||||
- import_tasks: "roles/matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
- import_tasks: "{{ role_path }}/../matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
||||||
|
|
||||||
- set_fact:
|
- set_fact:
|
||||||
matrix_mx_puppet_discord_requires_restart: true
|
matrix_mx_puppet_discord_requires_restart: true
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
engine_old: 'sqlite'
|
engine_old: 'sqlite'
|
||||||
systemd_services_to_stop: ['matrix-mx-puppet-instagram.service']
|
systemd_services_to_stop: ['matrix-mx-puppet-instagram.service']
|
||||||
|
|
||||||
- import_tasks: "roles/matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
- import_tasks: "{{ role_path }}/../matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
||||||
|
|
||||||
- set_fact:
|
- set_fact:
|
||||||
matrix_mx_puppet_instagram_requires_restart: true
|
matrix_mx_puppet_instagram_requires_restart: true
|
||||||
|
|
|
@ -58,7 +58,7 @@
|
||||||
engine_old: 'sqlite'
|
engine_old: 'sqlite'
|
||||||
systemd_services_to_stop: ['matrix-mx-puppet-skype.service']
|
systemd_services_to_stop: ['matrix-mx-puppet-skype.service']
|
||||||
|
|
||||||
- import_tasks: "roles/matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
- import_tasks: "{{ role_path }}/../matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
||||||
|
|
||||||
- set_fact:
|
- set_fact:
|
||||||
matrix_mx_puppet_skype_requires_restart: true
|
matrix_mx_puppet_skype_requires_restart: true
|
||||||
|
|
|
@ -54,7 +54,7 @@
|
||||||
engine_old: 'sqlite'
|
engine_old: 'sqlite'
|
||||||
systemd_services_to_stop: ['matrix-mx-puppet-slack.service']
|
systemd_services_to_stop: ['matrix-mx-puppet-slack.service']
|
||||||
|
|
||||||
- import_tasks: "roles/matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
- import_tasks: "{{ role_path }}/../matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
||||||
|
|
||||||
- set_fact:
|
- set_fact:
|
||||||
matrix_mx_puppet_slack_requires_restart: true
|
matrix_mx_puppet_slack_requires_restart: true
|
||||||
|
|
|
@ -58,7 +58,7 @@
|
||||||
engine_old: 'sqlite'
|
engine_old: 'sqlite'
|
||||||
systemd_services_to_stop: ['matrix-mx-puppet-steam.service']
|
systemd_services_to_stop: ['matrix-mx-puppet-steam.service']
|
||||||
|
|
||||||
- import_tasks: "roles/matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
- import_tasks: "{{ role_path }}/../matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
||||||
|
|
||||||
- set_fact:
|
- set_fact:
|
||||||
matrix_mx_puppet_steam_requires_restart: true
|
matrix_mx_puppet_steam_requires_restart: true
|
||||||
|
|
|
@ -58,7 +58,7 @@
|
||||||
engine_old: 'sqlite'
|
engine_old: 'sqlite'
|
||||||
systemd_services_to_stop: ['matrix-mx-puppet-twitter.service']
|
systemd_services_to_stop: ['matrix-mx-puppet-twitter.service']
|
||||||
|
|
||||||
- import_tasks: "roles/matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
- import_tasks: "{{ role_path }}/../matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
||||||
|
|
||||||
- set_fact:
|
- set_fact:
|
||||||
matrix_mx_puppet_twitter_requires_restart: true
|
matrix_mx_puppet_twitter_requires_restart: true
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
- 'ALTER TABLE dimension_users ALTER COLUMN "isSelfBot" TYPE BOOLEAN USING("isSelfBot"::text::boolean);'
|
- 'ALTER TABLE dimension_users ALTER COLUMN "isSelfBot" TYPE BOOLEAN USING("isSelfBot"::text::boolean);'
|
||||||
- 'ALTER TABLE dimension_users ALTER COLUMN "isSelfBot" SET default false;'
|
- 'ALTER TABLE dimension_users ALTER COLUMN "isSelfBot" SET default false;'
|
||||||
|
|
||||||
- import_tasks: "roles/matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
- import_tasks: "{{ role_path }}/../matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
||||||
|
|
||||||
- set_fact:
|
- set_fact:
|
||||||
matrix_dimension_requires_restart: true
|
matrix_dimension_requires_restart: true
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
systemd_services_to_stop: ['matrix-ma1sd.service']
|
systemd_services_to_stop: ['matrix-ma1sd.service']
|
||||||
pgloader_options: ['--with "quote identifiers"']
|
pgloader_options: ['--with "quote identifiers"']
|
||||||
|
|
||||||
- import_tasks: "roles/matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
- import_tasks: "{{ role_path }}/../matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
||||||
|
|
||||||
- set_fact:
|
- set_fact:
|
||||||
matrix_ma1sd_requires_restart: true
|
matrix_ma1sd_requires_restart: true
|
||||||
|
|
|
@ -135,7 +135,7 @@
|
||||||
- block:
|
- block:
|
||||||
# We can't use `{{ role_path }}` here, neither with `import_tasks`, nor with `include_tasks`,
|
# We can't use `{{ role_path }}` here, neither with `import_tasks`, nor with `include_tasks`,
|
||||||
# because it refers to the role that included this util, and not to the role this file belongs to.
|
# because it refers to the role that included this util, and not to the role this file belongs to.
|
||||||
- import_tasks: "roles/matrix-postgres/tasks/util/detect_existing_postgres_version.yml"
|
- import_tasks: "{{ role_path }}/../matrix-postgres/tasks/util/detect_existing_postgres_version.yml"
|
||||||
|
|
||||||
- set_fact:
|
- set_fact:
|
||||||
matrix_postgres_docker_image_to_use: "{{ matrix_postgres_docker_image_latest if matrix_postgres_detected_version_corresponding_docker_image == '' else matrix_postgres_detected_version_corresponding_docker_image }}"
|
matrix_postgres_docker_image_to_use: "{{ matrix_postgres_docker_image_latest if matrix_postgres_detected_version_corresponding_docker_image == '' else matrix_postgres_detected_version_corresponding_docker_image }}"
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
- ALTER TABLE tokens ALTER COLUMN ex_date TYPE TIMESTAMP WITHOUT TIME ZONE;
|
- ALTER TABLE tokens ALTER COLUMN ex_date TYPE TIMESTAMP WITHOUT TIME ZONE;
|
||||||
additional_psql_statements_db_name: "{{ matrix_registration_database_name }}"
|
additional_psql_statements_db_name: "{{ matrix_registration_database_name }}"
|
||||||
|
|
||||||
- import_tasks: "roles/matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
- import_tasks: "{{ role_path }}/../matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
||||||
|
|
||||||
- set_fact:
|
- set_fact:
|
||||||
matrix_registration_requires_restart: true
|
matrix_registration_requires_restart: true
|
||||||
|
|
Loading…
Reference in a new issue