From ce013a325c0512946752bb1bc80b2e56f06a1612 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Fri, 22 Dec 2023 08:43:10 +0200 Subject: [PATCH] Remove duplicate matrix_media_repo_identifier definition from group_vars/matrix_servers `matrix_media_repo_identifier` is already defined in the role defaults, which is a better role to have it anyway. --- group_vars/matrix_servers | 2 -- roles/custom/matrix-media-repo/defaults/main.yml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index d7f60275b..ba9e11bba 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -2693,8 +2693,6 @@ matrix_ma1sd_database_password: "{{ '%s' | format(matrix_homeserver_generic_secr # ###################################################################### -matrix_media_repo_identifier: matrix-media-repo - matrix_media_repo_enabled: false matrix_media_repo_container_network: "{{ matrix_nginx_proxy_container_network if matrix_playbook_reverse_proxy_type == 'playbook-managed-nginx' else matrix_media_repo_identifier }}" diff --git a/roles/custom/matrix-media-repo/defaults/main.yml b/roles/custom/matrix-media-repo/defaults/main.yml index 194012ea9..702bfcba5 100755 --- a/roles/custom/matrix-media-repo/defaults/main.yml +++ b/roles/custom/matrix-media-repo/defaults/main.yml @@ -9,7 +9,7 @@ matrix_media_repo_enabled: false # matrix_media_repo_identifier controls the identifier of this media-repo instance, which influences: # - the default storage path -# - the names of systemd services +# - the names of systemd services and containers matrix_media_repo_identifier: matrix-media-repo matrix_media_repo_container_image_self_build: false