From b0c801a4970584badeef6c6eeea7eb03beb10d08 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Fri, 7 Jan 2022 11:53:24 +0200 Subject: [PATCH] Rename variable for consistency (matrix_bot_honoroit_container_self_build -> matrix_bot_honoroit_container_image_self_build) Discussed in https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1514 --- group_vars/matrix_servers | 2 +- roles/matrix-bot-honoroit/defaults/main.yml | 4 ++-- roles/matrix-bot-honoroit/tasks/setup_install.yml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 393984c0f..99d70c996 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -969,7 +969,7 @@ matrix_bot_honoroit_systemd_required_services_list: | # Postgres is the default, except if not using `matrix_postgres` (internal postgres) matrix_bot_honoroit_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}" matrix_bot_honoroit_database_password: "{{ '%s' | format(matrix_synapse_macaroon_secret_key) | password_hash('sha512', 'honoroit.bot.db') | to_uuid }}" -matrix_bot_honoroit_container_self_build: "{{ matrix_architecture != 'amd64' }}" +matrix_bot_honoroit_container_image_self_build: "{{ matrix_architecture != 'amd64' }}" ###################################################################### # diff --git a/roles/matrix-bot-honoroit/defaults/main.yml b/roles/matrix-bot-honoroit/defaults/main.yml index fc1713bac..4e3628f9b 100644 --- a/roles/matrix-bot-honoroit/defaults/main.yml +++ b/roles/matrix-bot-honoroit/defaults/main.yml @@ -3,13 +3,13 @@ matrix_bot_honoroit_enabled: true -matrix_bot_honoroit_container_self_build: false +matrix_bot_honoroit_container_image_self_build: false matrix_bot_honoroit_docker_repo: "https://gitlab.com/etke.cc/honoroit.git" matrix_bot_honoroit_docker_src_files_path: "{{ matrix_base_data_path }}/honoroit/docker-src" matrix_bot_honoroit_version: v0.9.0 matrix_bot_honoroit_docker_image: "{{ matrix_bot_honoroit_docker_image_name_prefix }}honoroit:{{ matrix_bot_honoroit_version }}" -matrix_bot_honoroit_docker_image_name_prefix: "{{ 'localhost/' if matrix_bot_honoroit_container_self_build else 'registry.gitlab.com/etke.cc/' }}" +matrix_bot_honoroit_docker_image_name_prefix: "{{ 'localhost/' if matrix_bot_honoroit_container_image_self_build else 'registry.gitlab.com/etke.cc/' }}" matrix_bot_honoroit_docker_image_force_pull: "{{ matrix_bot_honoroit_docker_image.endswith(':latest') }}" matrix_bot_honoroit_base_path: "{{ matrix_base_data_path }}/honoroit" diff --git a/roles/matrix-bot-honoroit/tasks/setup_install.yml b/roles/matrix-bot-honoroit/tasks/setup_install.yml index 615235cb1..76eeb0065 100644 --- a/roles/matrix-bot-honoroit/tasks/setup_install.yml +++ b/roles/matrix-bot-honoroit/tasks/setup_install.yml @@ -51,7 +51,7 @@ source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}" force_source: "{{ matrix_bot_honoroit_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}" force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_bot_honoroit_docker_image_force_pull }}" - when: "not matrix_bot_honoroit_container_self_build|bool" + when: "not matrix_bot_honoroit_container_image_self_build|bool" - name: Ensure honoroit repository is present on self-build git: @@ -59,7 +59,7 @@ dest: "{{ matrix_bot_honoroit_docker_src_files_path }}" force: "yes" register: matrix_bot_honoroit_git_pull_results - when: "matrix_bot_honoroit_container_self_build|bool" + when: "matrix_bot_honoroit_container_image_self_build|bool" - name: Ensure honoroit image is built docker_image: @@ -71,7 +71,7 @@ dockerfile: docker/Dockerfile path: "{{ matrix_bot_honoroit_docker_src_files_path }}" pull: yes - when: "matrix_bot_honoroit_container_self_build|bool" + when: "matrix_bot_honoroit_container_image_self_build|bool" - name: Ensure matrix-bot-honoroit.service installed template: