From 905b31acaa286c18b8914bdd3f06fd2d00932230 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Thu, 8 Oct 2020 22:44:54 +0200 Subject: no more flush-handlers for apt-repos --- roles/apt-repo/aptly/handlers/main.yml | 4 --- roles/apt-repo/aptly/tasks/main.yml | 9 ++++-- roles/apt-repo/backports/handlers/main.yml | 4 --- roles/apt-repo/backports/tasks/main.yml | 6 ++-- roles/apt-repo/base/handlers/main.yml | 4 --- roles/apt-repo/base/tasks/main.yml | 10 ++++--- roles/apt-repo/blackmagic/handlers/main.yml | 4 --- roles/apt-repo/blackmagic/tasks/main.yml | 44 ++++++++++++++++------------ roles/apt-repo/kubernetes/handlers/main.yml | 4 --- roles/apt-repo/kubernetes/tasks/main.yml | 9 ++++-- roles/apt-repo/riot/handlers/main.yml | 4 --- roles/apt-repo/riot/tasks/main.yml | 9 ++++-- roles/apt-repo/spreadspace/handlers/main.yml | 4 --- roles/apt-repo/spreadspace/tasks/main.yml | 9 ++++-- roles/apt-repo/tor-project/handlers/main.yml | 4 --- roles/apt-repo/tor-project/tasks/main.yml | 9 ++++-- 16 files changed, 65 insertions(+), 72 deletions(-) delete mode 100644 roles/apt-repo/aptly/handlers/main.yml delete mode 100644 roles/apt-repo/backports/handlers/main.yml delete mode 100644 roles/apt-repo/base/handlers/main.yml delete mode 100644 roles/apt-repo/blackmagic/handlers/main.yml delete mode 100644 roles/apt-repo/kubernetes/handlers/main.yml delete mode 100644 roles/apt-repo/riot/handlers/main.yml delete mode 100644 roles/apt-repo/spreadspace/handlers/main.yml delete mode 100644 roles/apt-repo/tor-project/handlers/main.yml (limited to 'roles/apt-repo') diff --git a/roles/apt-repo/aptly/handlers/main.yml b/roles/apt-repo/aptly/handlers/main.yml deleted file mode 100644 index 03ed878a..00000000 --- a/roles/apt-repo/aptly/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: update apt cache - apt: - update_cache: yes diff --git a/roles/apt-repo/aptly/tasks/main.yml b/roles/apt-repo/aptly/tasks/main.yml index e11d610e..7a482549 100644 --- a/roles/apt-repo/aptly/tasks/main.yml +++ b/roles/apt-repo/aptly/tasks/main.yml @@ -3,14 +3,17 @@ copy: src: repo.gpg dest: /etc/apt/trusted.gpg.d/aptly.gpg - notify: update apt cache + register: apt_repo_aptly_key - name: add repository entry copy: content: | deb http://repo.aptly.info/ squeeze main dest: /etc/apt/sources.list.d/aptly.list - notify: update apt cache + register: apt_repo_aptly_sources - name: update apt cache - meta: flush_handlers + when: apt_repo_aptly_key is changed or + apt_repo_aptly_sources is changed + apt: + update_cache: yes diff --git a/roles/apt-repo/backports/handlers/main.yml b/roles/apt-repo/backports/handlers/main.yml deleted file mode 100644 index 03ed878a..00000000 --- a/roles/apt-repo/backports/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: update apt cache - apt: - update_cache: yes diff --git a/roles/apt-repo/backports/tasks/main.yml b/roles/apt-repo/backports/tasks/main.yml index 7f182ca7..e21b628f 100644 --- a/roles/apt-repo/backports/tasks/main.yml +++ b/roles/apt-repo/backports/tasks/main.yml @@ -4,7 +4,9 @@ content: | deb http://{{ apt_repo_providers[apt_repo_provider][(ansible_distribution | lower)].host }}{{ apt_repo_providers[apt_repo_provider][(ansible_distribution | lower)].path }} {{ ansible_distribution_release }}-backports {{ apt_repo_components | default(apt_repo_backports_components[(ansible_distribution | lower)]) | join(' ') }} dest: /etc/apt/sources.list.d/backports.list - notify: update apt cache + register: apt_repo_backports_sources - name: update apt cache - meta: flush_handlers + when: apt_repo_backports_sources is changed + apt: + update_cache: yes diff --git a/roles/apt-repo/base/handlers/main.yml b/roles/apt-repo/base/handlers/main.yml deleted file mode 100644 index 03ed878a..00000000 --- a/roles/apt-repo/base/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: update apt cache - apt: - update_cache: yes diff --git a/roles/apt-repo/base/tasks/main.yml b/roles/apt-repo/base/tasks/main.yml index cea99d04..cc2bc8a0 100644 --- a/roles/apt-repo/base/tasks/main.yml +++ b/roles/apt-repo/base/tasks/main.yml @@ -3,15 +3,17 @@ template: src: "{{ ansible_distribution }}.list.j2" dest: /etc/apt/sources.list - notify: update apt cache + register: apt_repo_base_sources - name: update apt cache - meta: flush_handlers + when: apt_repo_base_sources is changed + apt: + update_cache: yes ## aptitude is needed for package upgrade roles - name: install aptitude and https transport apt: name: - - aptitude - - apt-transport-https + - aptitude + - apt-transport-https state: present diff --git a/roles/apt-repo/blackmagic/handlers/main.yml b/roles/apt-repo/blackmagic/handlers/main.yml deleted file mode 100644 index 03ed878a..00000000 --- a/roles/apt-repo/blackmagic/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: update apt cache - apt: - update_cache: yes diff --git a/roles/apt-repo/blackmagic/tasks/main.yml b/roles/apt-repo/blackmagic/tasks/main.yml index 3152d7b8..c2652ed3 100644 --- a/roles/apt-repo/blackmagic/tasks/main.yml +++ b/roles/apt-repo/blackmagic/tasks/main.yml @@ -3,7 +3,7 @@ copy: src: repo.gpg dest: /etc/apt/trusted.gpg.d/blackmagic.gpg - notify: update apt cache + register: apt_repo_blackmagic_key - name: configure repo authentication @@ -16,28 +16,28 @@ line: "machine build.spreadspace.org login {{ apt_repo_blackmagic_auth.username }} password {{ apt_repo_blackmagic_auth.password }}" create: yes mode: 0600 - notify: update apt cache + register: apt_repo_blackmagic_auth_legacy - name: configure repo authentication when: (ansible_distribution == "Ubuntu") or (ansible_distribution == "Debian" and (ansible_distribution_major_version | int) >= 10) block: - - name: remove old repo authentication - lineinfile: - path: /etc/apt/auth.conf - regexp: "^machine build.spreadspace.org " - state: absent - notify: update apt cache + - name: remove old repo authentication + lineinfile: + path: /etc/apt/auth.conf + regexp: "^machine build.spreadspace.org " + state: absent + register: apt_repo_blackmagic_auth_legacy_remove - - name: configure repo authentication - copy: - content: | - machine build.spreadspace.org - login {{ apt_repo_blackmagic_auth.username }} - password {{ apt_repo_blackmagic_auth.password }} - dest: /etc/apt/auth.conf.d/blackmagic.conf - mode: 0600 - notify: update apt cache + - name: configure repo authentication + copy: + content: | + machine build.spreadspace.org + login {{ apt_repo_blackmagic_auth.username }} + password {{ apt_repo_blackmagic_auth.password }} + dest: /etc/apt/auth.conf.d/blackmagic.conf + mode: 0600 + register: apt_repo_blackmagic_auth - name: add repository entry @@ -45,7 +45,13 @@ content: | deb https://build.spreadspace.org/ {{ ansible_distribution_release }} blackmagic dest: /etc/apt/sources.list.d/blackmagic.list - notify: update apt cache + register: apt_repo_blackmagic_sources - name: update apt cache - meta: flush_handlers + when: apt_repo_blackmagic_key is changed or + apt_repo_blackmagic_auth_legacy is changed or + apt_repo_blackmagic_auth_legacy_remove is changed or + apt_repo_blackmagic_auth is changed or + apt_repo_blackmagic_sources is changed + apt: + update_cache: yes diff --git a/roles/apt-repo/kubernetes/handlers/main.yml b/roles/apt-repo/kubernetes/handlers/main.yml deleted file mode 100644 index 03ed878a..00000000 --- a/roles/apt-repo/kubernetes/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: update apt cache - apt: - update_cache: yes diff --git a/roles/apt-repo/kubernetes/tasks/main.yml b/roles/apt-repo/kubernetes/tasks/main.yml index 0226a3ff..56e11f78 100644 --- a/roles/apt-repo/kubernetes/tasks/main.yml +++ b/roles/apt-repo/kubernetes/tasks/main.yml @@ -3,14 +3,17 @@ copy: src: repo.gpg dest: /etc/apt/trusted.gpg.d/kubernetes.gpg - notify: update apt cache + register: apt_repo_kubernetes_key - name: add repository entry copy: content: | deb https://apt.kubernetes.io/ kubernetes-xenial main dest: /etc/apt/sources.list.d/kubernetes.list - notify: update apt cache + register: apt_repo_kubernetes_sources - name: update apt cache - meta: flush_handlers + when: apt_repo_kubernetes_key is changed or + apt_repo_kubernetes_sources is changed + apt: + update_cache: yes diff --git a/roles/apt-repo/riot/handlers/main.yml b/roles/apt-repo/riot/handlers/main.yml deleted file mode 100644 index 03ed878a..00000000 --- a/roles/apt-repo/riot/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: update apt cache - apt: - update_cache: yes diff --git a/roles/apt-repo/riot/tasks/main.yml b/roles/apt-repo/riot/tasks/main.yml index 060cc8e3..8bc075dd 100644 --- a/roles/apt-repo/riot/tasks/main.yml +++ b/roles/apt-repo/riot/tasks/main.yml @@ -3,14 +3,17 @@ copy: src: repo.gpg dest: /etc/apt/trusted.gpg.d/riot.gpg - notify: update apt cache + register: apt_repo_riot_key - name: add repository entry copy: content: | deb https://riot.im/packages/debian/ default main dest: /etc/apt/sources.list.d/riot.list - notify: update apt cache + register: apt_repo_riot_sources - name: update apt cache - meta: flush_handlers + when: apt_repo_riot_key is changed or + apt_repo_riot_sources is changed + apt: + update_cache: yes diff --git a/roles/apt-repo/spreadspace/handlers/main.yml b/roles/apt-repo/spreadspace/handlers/main.yml deleted file mode 100644 index 03ed878a..00000000 --- a/roles/apt-repo/spreadspace/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: update apt cache - apt: - update_cache: yes diff --git a/roles/apt-repo/spreadspace/tasks/main.yml b/roles/apt-repo/spreadspace/tasks/main.yml index 0b3f3cd6..9f656413 100644 --- a/roles/apt-repo/spreadspace/tasks/main.yml +++ b/roles/apt-repo/spreadspace/tasks/main.yml @@ -3,14 +3,17 @@ copy: src: repo.gpg dest: /etc/apt/trusted.gpg.d/spreadspace.gpg - notify: update apt cache + register: apt_repo_spreadspace_key - name: add repository entry copy: content: | deb https://build.spreadspace.org/ {{ ansible_distribution_release }} main dest: /etc/apt/sources.list.d/spreadspace.list - notify: update apt cache + register: apt_repo_spreadspace_sources - name: update apt cache - meta: flush_handlers + when: apt_repo_spreadspace_key is changed or + apt_repo_spreadspace_sources is changed + apt: + update_cache: yes diff --git a/roles/apt-repo/tor-project/handlers/main.yml b/roles/apt-repo/tor-project/handlers/main.yml deleted file mode 100644 index 03ed878a..00000000 --- a/roles/apt-repo/tor-project/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: update apt cache - apt: - update_cache: yes diff --git a/roles/apt-repo/tor-project/tasks/main.yml b/roles/apt-repo/tor-project/tasks/main.yml index 2283e41a..5c850de0 100644 --- a/roles/apt-repo/tor-project/tasks/main.yml +++ b/roles/apt-repo/tor-project/tasks/main.yml @@ -3,14 +3,17 @@ copy: src: repo.gpg dest: /etc/apt/trusted.gpg.d/tor-project.gpg - notify: update apt cache + register: apt_repo_tor_project_key - name: add repository entry copy: content: | deb [arch=amd64] http://deb.torproject.org/torproject.org {{ ansible_distribution_release }} main dest: /etc/apt/sources.list.d/tor-poject.list - notify: update apt cache + register: apt_repo_tor_project_sources - name: update apt cache - meta: flush_handlers + when: apt_repo_tor_project_key is changed or + apt_repo_tor_project_sources is changed + apt: + update_cache: yes -- cgit v1.2.3