From fbbb0419b06b9773630d6b7e8112a7e8504c8f06 Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten Date: Fri, 3 May 2024 12:20:43 +0200 Subject: [PATCH] Consistency changes --- tasks/repository.yml | 4 ++-- vars/main.yml | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tasks/repository.yml b/tasks/repository.yml index 018ce13..5d6465d 100644 --- a/tasks/repository.yml +++ b/tasks/repository.yml @@ -12,7 +12,7 @@ - name: repository | remove old public key ansible.builtin.apt_key: id: "{{ item.id }}" - keyserver: "{{ item.keyserver }}" + keyserver: "{{ apt_key_keyserver | default('keyserver.ubuntu.com') }}" state: absent with_items: "{{ influxdb_old_apt_keys }}" tags: @@ -21,7 +21,7 @@ - name: repository | add public key ansible.builtin.apt_key: id: "{{ item.id }}" - keyserver: "{{ item.keyserver }}" + keyserver: "{{ apt_key_keyserver | default('keyserver.ubuntu.com') }}" state: present with_items: "{{ influxdb_apt_keys }}" tags: diff --git a/vars/main.yml b/vars/main.yml index 09c46d2..c878a4b 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -8,11 +8,9 @@ influxdb_dependencies_pre: influxdb_old_apt_keys: - id: 684A14CF2582E0C5 - keyserver: keyserver.ubuntu.com influxdb_apt_keys: - id: 9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E - keyserver: keyserver.ubuntu.com influxdb_downloads_path: /var/lib/ansible/influxdb/downloads