Merge branch 'master' into feature/dendrite

group_vars/matrix_servers

@@ -983,7 +983,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' }}"
 
 ######################################################################
 #

roles/matrix-bot-honoroit/defaults/main.yml

@@ -3,7 +3,7 @@
 
 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"
 

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: