From b5df9a12250b0b002c0537e0af3de5ba8ff564b0 Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Sun, 24 Oct 2021 13:48:50 +0200 Subject: [PATCH] Extract GPG keyserver for backups into global var --- group_vars/all/vars.yml | 2 ++ roles/git_auto_update/templates/update.sh | 2 +- roles/server/gitea/templates/update_gitea.sh | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml index b5a2d97..57c9e70 100644 --- a/group_vars/all/vars.yml +++ b/group_vars/all/vars.yml @@ -12,6 +12,8 @@ ansible_user: "{{ global_username }}" ansible_become: yes ansible_become_pass: "{{ zocker_password }}" +default_gpg_keyserver_hostname: "eu.pool.sks-keyservers.net" + default_tg_monitor_recipient_id: "{{ zocker_telegram_id }}" zocker_authorized_keys_url: "https://git.banananet.work/zocker.keys" diff --git a/roles/git_auto_update/templates/update.sh b/roles/git_auto_update/templates/update.sh index 9e00d4d..8c4773c 100644 --- a/roles/git_auto_update/templates/update.sh +++ b/roles/git_auto_update/templates/update.sh @@ -21,7 +21,7 @@ fi git remote set-url origin "$REPO"; [ -z "$GPG_FINGERPRINT" ] || - gpg --quiet --keyserver eu.pool.sks-keyservers.net --recv "$GPG_FINGERPRINT"; + gpg --quiet --keyserver {{ default_gpg_keyserver_hostname | quote }} --recv "$GPG_FINGERPRINT"; git fetch --recurse-submodules --tags > /dev/null; TAG=$(git tag --list | grep "^$PREFIX" | sort -r | head -n 1); diff --git a/roles/server/gitea/templates/update_gitea.sh b/roles/server/gitea/templates/update_gitea.sh index 2422a58..b6b4b5b 100644 --- a/roles/server/gitea/templates/update_gitea.sh +++ b/roles/server/gitea/templates/update_gitea.sh @@ -10,7 +10,7 @@ readonly SERVICE_NAME={{ gitea_service_name | quote }}; set -euxo pipefail; -gpg --quiet --keyserver eu.pool.sks-keyservers.net --recv "$GPG_FINGERPRINT"; +gpg --quiet --keyserver {{ default_gpg_keyserver_hostname | quote }} --recv "$GPG_FINGERPRINT"; function error() { echo "$@" >&2;