mirror/matrix-docker-ansible-deploy
1
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2025-07-13 11:25:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename playbook variables so they are consistently prefixed

Browse Source 
Pretty much all variables live in their own `matrix_<whatever>`
prefix now and are grouped closer together in the default
variables file (`roles/matrix-server/defaults/main.yml`).
This commit is contained in:
Slavi Pantaleev
2018-11-01 08:46:47 +02:00
parent 8343fc39f1
commit fb5115a544
25 changed files with 115 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
roles/matrix-server/tasks/upgrade_postgres.yml
View File

@ -52,16 +52,16 @@
- name: Determine Postgres version to use (default to latest)
set_fact:
matrix_docker_image_postgres_to_use: "{{ matrix_docker_image_postgres_latest }}"
matrix_postgres_docker_image_to_use: "{{ matrix_postgres_docker_image_latest }}"
- name: Determine Postgres version to use (use 9.x, if detected)
set_fact:
matrix_docker_image_postgres_to_use: "{{ matrix_docker_image_postgres_v9 }}"
matrix_postgres_docker_image_to_use: "{{ matrix_postgres_docker_image_v9 }}"
when: "pg_version.startswith('9.')"
- name: Abort, if already at latest Postgres version
fail: msg="You are already running the latest Postgres version supported. Nothing to do"
when: "matrix_docker_image_postgres_to_use == matrix_docker_image_postgres_latest"
when: "matrix_postgres_docker_image_to_use == matrix_postgres_docker_image_latest"
- name: Ensure matrix-synapse is stopped
service: name=matrix-synapse state=stopped
@ -81,7 +81,7 @@
--link matrix-postgres:postgres \
--env-file={{ matrix_environment_variables_data_path }}/env-postgres-pgsql-docker \
-v {{ postgres_dump_dir }}:/out \
{{ matrix_docker_image_postgres_to_use }} pg_dump -h postgres {{ matrix_postgres_db_name }} -f /out/{{ postgres_dump_name }}
{{ matrix_postgres_docker_image_to_use }} pg_dump -h postgres {{ matrix_postgres_db_name }} -f /out/{{ postgres_dump_name }}
- name: Ensure matrix-postgres is stopped
service: name=matrix-postgres state=stopped
@ -109,7 +109,7 @@
--link matrix-postgres:postgres \
--env-file={{ matrix_environment_variables_data_path }}/env-postgres-pgsql-docker \
-v {{ postgres_dump_dir }}:/in:ro \
{{ matrix_docker_image_postgres_latest }} psql -h postgres -f /in/{{ postgres_dump_name }}
{{ matrix_postgres_docker_image_latest }} psql -h postgres -f /in/{{ postgres_dump_name }}
- name: Delete Postgres database dump file
file: