no more flush-handlers for apt-repos

3 files changed, 22 insertions, 23 deletions

diff --git a/roles/elevate/liquidtruth/handlers/main.yml b/roles/elevate/liquidtruth/handlers/main.yml
deleted file mode 100644
index 03ed878a..00000000
--- a/roles/elevate/liquidtruth/handlers/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- name: update apt cache
-  apt:
-    update_cache: yes
diff --git a/roles/elevate/liquidtruth/tasks/nodejs.yml b/roles/elevate/liquidtruth/tasks/nodejs.yml
index 78063298..2ef1db34 100644
--- a/roles/elevate/liquidtruth/tasks/nodejs.yml
+++ b/roles/elevate/liquidtruth/tasks/nodejs.yml
@@ -3,17 +3,20 @@
   copy:
     src: nodesource.gpg
     dest: /etc/apt/trusted.gpg.d/nodejs.gpg
-  notify: update apt cache
+  register: apt_repo_nodejs_key
 
 - name: add repository entry
   copy:
     content: |
       deb https://deb.nodesource.com/node_10.x {{ ansible_distribution_release }} main
     dest: /etc/apt/sources.list.d/nodejs.list
-  notify: update apt cache
+  register: apt_repo_nodejs_sources
 
 - name: update apt cache
-  meta: flush_handlers
+  when: apt_repo_nodejs_key is changed or
+        apt_repo_nodejs_sources is changed
+  apt:
+    update_cache: yes
 
 - name: install nodejs
   apt:
diff --git a/roles/elevate/media/tasks/network.yml b/roles/elevate/media/tasks/network.yml
index 17e82097..ef6d364a 100644
--- a/roles/elevate/media/tasks/network.yml
+++ b/roles/elevate/media/tasks/network.yml
@@ -6,11 +6,11 @@
 
 - name: install netplan configs
   loop:
-    - lan-only
-    - r3
-    - r3-with-lan
-    - elevate-festival
-    - elevate-office
+  - lan-only
+  - r3
+  - r3-with-lan
+  - elevate-festival
+  - elevate-office
   template:
     src: "netplan/{{ item }}.yaml.j2"
     dest: "/etc/netplan/conf-available/{{ item }}.yaml"
@@ -18,11 +18,11 @@
 
 - name: install firewall scripts
   loop:
-    - lan-only
-    - r3
-    - r3-with-lan
-    - elevate-festival
-    - elevate-office
+  - lan-only
+  - r3
+  - r3-with-lan
+  - elevate-festival
+  - elevate-office
   template:
     src: "firewall/{{ item }}.sh.j2"
     dest: "/etc/saswall/{{ item }}.sh"
@@ -37,17 +37,17 @@
 
 - name: set active netwok setup
   loop:
-    - dest: /etc/netplan/01-active.yaml
-      src: "conf-available/{{ network_setup }}.yaml"
-    - dest: /etc/saswall/rules.sh
-      src: "{{ network_setup }}.sh"
+  - dest: /etc/netplan/01-active.yaml
+    src: "conf-available/{{ network_setup }}.yaml"
+  - dest: /etc/saswall/rules.sh
+    src: "{{ network_setup }}.sh"
   file:
     state: link
     dest: "{{ item.dest }}"
     src: "{{ item.src }}"
   notify:
-    - netplan apply
-    - firewall restart
+  - netplan apply
+  - firewall restart
 
 - name: make sure network config has been applied
   meta: flush_handlers