From ad6ce6349cdbb1a544816e8796ad30a6408da885 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Wed, 22 Feb 2023 19:38:56 +0100 Subject: [PATCH] option wireguard_update_cache to disable refresh previously disable the cache update was only possible on ubuntu using the generic name wireguard_update_cache it can be enabled for all operating systems --- README.md | 6 +++--- defaults/main.yml | 2 +- molecule/kvm-single-server/prepare.yml | 2 +- molecule/kvm/prepare.yml | 2 +- tasks/setup-almalinux-8.yml | 2 +- tasks/setup-centos-7.yml | 6 +++--- tasks/setup-debian-pve-guest-variant.yml | 2 +- tasks/setup-debian-pve-host-variant.yml | 2 +- tasks/setup-debian-raspbian-buster.yml | 2 +- tasks/setup-debian-vanilla.yml | 2 +- tasks/setup-elementary os.yml | 2 +- tasks/setup-rocky-8.yml | 4 ++-- tasks/setup-ubuntu.yml | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 0778bd1..d5658bf 100644 --- a/README.md +++ b/README.md @@ -139,6 +139,9 @@ wireguard_interface_restart: false # course a very sensitive value you might consider a tool like Ansible Vault # to store it encrypted. # wireguard_private_key: + +# Set to "false" if package cache should not be updated +wireguard_update_cache: "true" ``` There are also a few Linux distribution specific settings: @@ -150,9 +153,6 @@ There are also a few Linux distribution specific settings: # - elementary OS ####################################### -# Set to "false" if package cache should not be updated -wireguard_ubuntu_update_cache: "true" - # Set package cache valid time wireguard_ubuntu_cache_valid_time: "3600" diff --git a/defaults/main.yml b/defaults/main.yml index 2a7666d..f2ca82b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -74,7 +74,7 @@ wireguard_interface_restart: false ####################################### # Set to "false" if package cache should not be updated -wireguard_ubuntu_update_cache: "true" +wireguard_update_cache: "true" # Set package cache valid time wireguard_ubuntu_cache_valid_time: "3600" diff --git a/molecule/kvm-single-server/prepare.yml b/molecule/kvm-single-server/prepare.yml index 8b00225..fef2ecd 100644 --- a/molecule/kvm-single-server/prepare.yml +++ b/molecule/kvm-single-server/prepare.yml @@ -9,5 +9,5 @@ tasks: - name: Update APT package cache ansible.builtin.apt: - update_cache: true + update_cache: "{{ wireguard_update_cache }}" cache_valid_time: 3600 diff --git a/molecule/kvm/prepare.yml b/molecule/kvm/prepare.yml index 76e3483..f6642c4 100644 --- a/molecule/kvm/prepare.yml +++ b/molecule/kvm/prepare.yml @@ -43,7 +43,7 @@ tasks: - name: Update APT package cache ansible.builtin.apt: - update_cache: true + update_cache: "{{ wireguard_update_cache }}" cache_valid_time: 3600 - hosts: el8dkms diff --git a/tasks/setup-almalinux-8.yml b/tasks/setup-almalinux-8.yml index 42a3a45..7e3f896 100644 --- a/tasks/setup-almalinux-8.yml +++ b/tasks/setup-almalinux-8.yml @@ -7,7 +7,7 @@ name: - epel-release - elrepo-release - update_cache: true + update_cache: "{{ wireguard_update_cache }}" - name: (AlmaLinux 8) Ensure WireGuard DKMS package is removed ansible.builtin.yum: diff --git a/tasks/setup-centos-7.yml b/tasks/setup-centos-7.yml index 11b2f42..5d52fa3 100644 --- a/tasks/setup-centos-7.yml +++ b/tasks/setup-centos-7.yml @@ -11,12 +11,12 @@ name: - epel-release - https://www.elrepo.org/elrepo-release-7.el7.elrepo.noarch.rpm - update_cache: true + update_cache: "{{ wireguard_update_cache }}" - name: (CentOS 7) Install yum-plugin-elrepo ansible.builtin.yum: name: yum-plugin-elrepo - update_cache: true + update_cache: "{{ wireguard_update_cache }}" - name: (CentOS 7) Install WireGuard packages ansible.builtin.yum: @@ -40,7 +40,7 @@ name: - epel-release - yum-utils - update_cache: true + update_cache: "{{ wireguard_update_cache }}" - name: (CentOS 7) Enable CentosPlus repo ansible.builtin.command: yum-config-manager --setopt=centosplus.includepkgs=kernel-plus --enablerepo=centosplus --save diff --git a/tasks/setup-debian-pve-guest-variant.yml b/tasks/setup-debian-pve-guest-variant.yml index c31d210..6eaa508 100644 --- a/tasks/setup-debian-pve-guest-variant.yml +++ b/tasks/setup-debian-pve-guest-variant.yml @@ -6,7 +6,7 @@ ansible.builtin.apt_repository: repo: "deb http://deb.debian.org/debian buster-backports main" state: "{{ 'present' if (ansible_distribution_version | int <= 10) else 'absent' }}" - update_cache: true + update_cache: "{{ wireguard_update_cache }}" - name: (Proxmox lxc) Install wireguard-tools. ansible.builtin.apt: diff --git a/tasks/setup-debian-pve-host-variant.yml b/tasks/setup-debian-pve-host-variant.yml index a9638de..c41505e 100644 --- a/tasks/setup-debian-pve-host-variant.yml +++ b/tasks/setup-debian-pve-host-variant.yml @@ -8,7 +8,7 @@ ansible.builtin.apt_repository: repo: "deb http://deb.debian.org/debian buster-backports main" state: "{{ 'present' if (ansible_distribution_version | int <= 10) else 'absent' }}" - update_cache: true + update_cache: "{{ wireguard_update_cache }}" - name: (Proxmox) Install kernel headers for the currently running kernel to compile WireGuard with DKMS ansible.builtin.apt: diff --git a/tasks/setup-debian-raspbian-buster.yml b/tasks/setup-debian-raspbian-buster.yml index 3cc2b26..58ed809 100644 --- a/tasks/setup-debian-raspbian-buster.yml +++ b/tasks/setup-debian-raspbian-buster.yml @@ -27,7 +27,7 @@ ansible.builtin.apt_repository: repo: "deb http://deb.debian.org/debian buster-backports main" state: present - update_cache: true + update_cache: "{{ wireguard_update_cache }}" - name: (Raspbian) Install latest kernel ansible.builtin.apt: diff --git a/tasks/setup-debian-vanilla.yml b/tasks/setup-debian-vanilla.yml index 7cf2d74..6ec0359 100644 --- a/tasks/setup-debian-vanilla.yml +++ b/tasks/setup-debian-vanilla.yml @@ -11,7 +11,7 @@ ansible.builtin.apt_repository: repo: "deb http://deb.debian.org/debian buster-backports main" state: present - update_cache: true + update_cache: "{{ wireguard_update_cache }}" - name: (Debian) Install kernel headers for the currently running kernel to compile Wireguard with DKMS ansible.builtin.apt: diff --git a/tasks/setup-elementary os.yml b/tasks/setup-elementary os.yml index 0aebefa..5d24ef3 100644 --- a/tasks/setup-elementary os.yml +++ b/tasks/setup-elementary os.yml @@ -4,7 +4,7 @@ - name: (elementary OS) Update APT package cache ansible.builtin.apt: - update_cache: "{{ wireguard_ubuntu_update_cache }}" + update_cache: "{{ wireguard_update_cache }}" cache_valid_time: "{{ wireguard_ubuntu_cache_valid_time }}" - name: (elementary OS) Install wireguard package diff --git a/tasks/setup-rocky-8.yml b/tasks/setup-rocky-8.yml index f40a255..0210167 100644 --- a/tasks/setup-rocky-8.yml +++ b/tasks/setup-rocky-8.yml @@ -11,7 +11,7 @@ name: - epel-release - elrepo-release - update_cache: true + update_cache: "{{ wireguard_update_cache }}" - name: (Rocky Linux 8) Ensure WireGuard DKMS package is removed ansible.builtin.yum: @@ -40,7 +40,7 @@ ansible.builtin.yum: name: - epel-release - update_cache: true + update_cache: "{{ wireguard_update_cache }}" - name: (Rocky Linux 8) Ensure WireGuard KMOD package is removed ansible.builtin.yum: diff --git a/tasks/setup-ubuntu.yml b/tasks/setup-ubuntu.yml index 376f6f9..8d0084b 100644 --- a/tasks/setup-ubuntu.yml +++ b/tasks/setup-ubuntu.yml @@ -4,7 +4,7 @@ - name: (Ubuntu) Update APT package cache ansible.builtin.apt: - update_cache: "{{ wireguard_ubuntu_update_cache }}" + update_cache: "{{ wireguard_update_cache }}" cache_valid_time: "{{ wireguard_ubuntu_cache_valid_time }}" - name: (Ubuntu) Tasks for Ubuntu < 19.10