From 23845c1d24bebb85929c3b6f9c03c8da578d1133 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sat, 13 Jan 2024 17:13:29 +0200 Subject: [PATCH] Remove matrix_docker_network references from matrix-bridge-hookshot --- roles/custom/matrix-bridge-hookshot/defaults/main.yml | 2 +- roles/custom/matrix-bridge-hookshot/tasks/validate_config.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/custom/matrix-bridge-hookshot/defaults/main.yml b/roles/custom/matrix-bridge-hookshot/defaults/main.yml index d4c62a86b..b605cfcc2 100644 --- a/roles/custom/matrix-bridge-hookshot/defaults/main.yml +++ b/roles/custom/matrix-bridge-hookshot/defaults/main.yml @@ -225,7 +225,7 @@ matrix_hookshot_permissions: [] matrix_hookshot_bot_displayname: Hookshot Bot matrix_hookshot_bot_avatar: 'mxc://half-shot.uk/2876e89ccade4cb615e210c458e2a7a6883fe17d' -matrix_hookshot_container_network: "{{ matrix_docker_network }}" +matrix_hookshot_container_network: "" # A list of extra arguments to pass to the container matrix_hookshot_container_extra_arguments: [] diff --git a/roles/custom/matrix-bridge-hookshot/tasks/validate_config.yml b/roles/custom/matrix-bridge-hookshot/tasks/validate_config.yml index bc32c5454..cb1fa3025 100644 --- a/roles/custom/matrix-bridge-hookshot/tasks/validate_config.yml +++ b/roles/custom/matrix-bridge-hookshot/tasks/validate_config.yml @@ -30,7 +30,7 @@ - {'old': 'matrix_hookshot_gitlab_secret', 'new': 'matrix_hookshot_gitlab_webhook_secret'} - {'old': 'matrix_hookshot_ident', 'new': 'matrix_hookshot_identifier'} -- name: Fail if required settings not defined +- name: Fail if required Hookshot settings not defined ansible.builtin.fail: msg: >- You need to define a required configuration setting (`{{ item }}`). @@ -39,6 +39,7 @@ - "matrix_hookshot_appservice_token" - "matrix_hookshot_homeserver_address" - "matrix_hookshot_homeserver_token" + - "matrix_hookshot_container_network" - name: Fail if required GitHub settings not defined ansible.builtin.fail: