import fastd-exporter role

roles/base/tasks/gwvpn.yml

@@ -50,3 +50,7 @@
   fetch:
     src: /etc/fastd/ffhl_mesh_gwvpn/pubkey.key
     dest: artifacts/
+
+- name: install fastd-exporter
+  import_role:
+    name: fastd-exporter

roles/base/tasks/software.yml

@@ -72,22 +72,3 @@
   modprobe:
     name: batman-adv
     state: present
-
-
-# install prometheus-fastd-exporter
-- name: install prometheus-fastd-exporter
-  tags: [prometheus-fastd-exporter, fastd]
-  notify: restart prometheus-fastd-exporter
-  block:
-    - name: download prometheus-fastd-exporter
-      get_url:
-        url: https://freifunk-luebeck.pages.chaotikum.org/prometheus-fastd-exporter/prometheus-fastd-exporter.deb
-        dest: /tmp/prometheus-fastd-exporter.deb
-    - name: install prometheus-fastd-exporter
-      apt:
-        state: present
-        deb: /tmp/prometheus-fastd-exporter.deb
-    - name: enable prometheus-fastd-exporter
-      systemd:
-        enabled: yes
-        name: prometheus-fastd-exporter

roles/meshvpn/tasks/base.yml

@@ -6,7 +6,6 @@
     update_cache: yes
     state: present
     name:
-      # necessary packets
       - batctl
       - fastd=22-2~bpo11+1
       - iproute2
@@ -17,23 +16,3 @@
   modprobe:
     name: batman-adv
     state: present
-
-
-# install prometheus-fastd-exporter
-- name: install prometheus-fastd-exporter
-  tags: [prometheus-fastd-exporter, fastd]
-  block:
-  - name: download prometheus-fastd-exporter
-    get_url:
-      url: https://freifunk-luebeck.pages.chaotikum.org/prometheus-fastd-exporter/prometheus-fastd-exporter.deb
-      dest: /tmp/prometheus-fastd-exporter.deb
-  - name: install prometheus-fastd-exporter
-    command: dpkg -i --force-confold /tmp/prometheus-fastd-exporter.deb
-  - name: reload systemd
-    systemd:
-      daemon_reload: yes
-  - name: enable prometheus-fastd-exporter
-    systemd:
-      state: restarted
-      enabled: yes
-      name: prometheus-fastd-exporter

roles/meshvpn/tasks/main.yml

@@ -17,3 +17,7 @@
 
 - import_tasks: dhcpd.yml
   tags: [dhcp]
+
+- name: install fastd-exporter
+  import_role:
+    name: fastd-exporter