From 6e0bcf25f0b3fa0805c5af5a8fcebc163b599914 Mon Sep 17 00:00:00 2001 From: VC Date: Fri, 5 Jul 2024 11:53:30 +0200 Subject: [PATCH] chore: remove completely unifi --- host_vars/munin.dmz.mateu.be.yml | 4 ++++ production.yml | 6 +----- roles/munin-server/templates/munin.conf.j2 | 5 +++++ roles/unifi/tasks/main.yml | 17 ----------------- site.yml | 1 - unifi.yml | 6 ------ 6 files changed, 10 insertions(+), 29 deletions(-) delete mode 100644 roles/unifi/tasks/main.yml delete mode 100644 unifi.yml diff --git a/host_vars/munin.dmz.mateu.be.yml b/host_vars/munin.dmz.mateu.be.yml index c09c976..9539d82 100644 --- a/host_vars/munin.dmz.mateu.be.yml +++ b/host_vars/munin.dmz.mateu.be.yml @@ -1,5 +1,9 @@ --- +openwrt_hosts: + - name: enbarr.dmz.mateu.be + address: 10.233.212.50 + mikrotik_unitary_scripts: - mikrotikcpu_ - mikrotikmemory_ diff --git a/production.yml b/production.yml index d52656d..fd87e00 100644 --- a/production.yml +++ b/production.yml @@ -66,7 +66,7 @@ borg_client: - /srv/docker/m.nintendojo.fr/public 93b2685c-9087-4e52-a66f-bf44bfc4a13a.pub.instances.scw.cloud: 20b4f083-4ef3-4a82-b15c-edbc31aa1731.pub.instances.scw.cloud: - scootaloo_min_refresh_interval: 10 + scootaloo_min_refresh_interval: 20 borg_backup_path: - /srv - /home @@ -240,10 +240,6 @@ fedinupesservers: 93b2685c-9087-4e52-a66f-bf44bfc4a13a.pub.instances.scw.cloud: 20b4f083-4ef3-4a82-b15c-edbc31aa1731.pub.instances.scw.cloud: -unifiservers: - hosts: - unifi.dmz.mateu.be: - ftpservers: hosts: ftp.dmz.mateu.be: diff --git a/roles/munin-server/templates/munin.conf.j2 b/roles/munin-server/templates/munin.conf.j2 index 98e87f9..fea32ef 100644 --- a/roles/munin-server/templates/munin.conf.j2 +++ b/roles/munin-server/templates/munin.conf.j2 @@ -106,6 +106,11 @@ includedir /etc/munin/munin-conf.d address 127.0.0.1 {% endfor %} +{% for host in openwrt_hosts %} +[{{ host.name }}] + address {{ host.address }} +{% endfor %} + # # A more complex example of a host tree # diff --git a/roles/unifi/tasks/main.yml b/roles/unifi/tasks/main.yml deleted file mode 100644 index 866c95a..0000000 --- a/roles/unifi/tasks/main.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- - -- name: Add APT Key for Unifi - get_url: - url: https://dl.ui.com/unifi/unifi-repo.gpg - dest: /etc/apt/trusted.gpg.d - -- name: Add APT Unifi repository - apt_repository: - repo: deb https://www.ui.com/downloads/unifi/debian stable ubiquiti - state: present - filename: unifi - -- name: install Unifi - package: - name: unifi - state: present diff --git a/site.yml b/site.yml index b307b0d..97a3faa 100644 --- a/site.yml +++ b/site.yml @@ -20,6 +20,5 @@ - import_playbook: mumble.yml - import_playbook: icecast2.yml - import_playbook: munin.yml -- import_playbook: unifi.yml - import_playbook: ftp.yml - import_playbook: garage.yml diff --git a/unifi.yml b/unifi.yml deleted file mode 100644 index ed8c17a..0000000 --- a/unifi.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -- hosts: unifiservers - diff: true - roles: - - unifi