From 029b001f9b11b6b0ce23760aedeb8978be3f0a81 Mon Sep 17 00:00:00 2001
From: Jeltz <jeltz@auro.re>
Date: Sun, 28 Jan 2024 19:30:51 +0100
Subject: [PATCH] misc: add collabora.pub

---
 host_vars/collabora.pub.infra.auro.re.yml       | 11 +++++++++++
 host_vars/ns-master.int.infra.auro.re/knotd.yml |  6 ++++++
 hosts                                           |  3 +++
 playbooks/base.yml                              |  1 +
 playbooks/ifupdown2.yml                         |  1 +
 playbooks/openssh.yml                           |  1 +
 playbooks/root.yml                              |  1 +
 playbooks/systemd_link.yml                      |  1 +
 roles/base_utils/tasks/main.yml                 |  1 -
 9 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 host_vars/collabora.pub.infra.auro.re.yml

diff --git a/host_vars/collabora.pub.infra.auro.re.yml b/host_vars/collabora.pub.infra.auro.re.yml
new file mode 100644
index 0000000..739e3a8
--- /dev/null
+++ b/host_vars/collabora.pub.infra.auro.re.yml
@@ -0,0 +1,11 @@
+---
+systemd_link__links:
+  pub0: ae:ae:ae:2C:60:35
+
+ifupdown2__interfaces:
+  pub0:
+    addresses:
+      - 2a09:6840:128::220/64
+      - 10.128.0.220/16
+    gateways: "{{ ifupdown2__gateways.adm }}"
+...
diff --git a/host_vars/ns-master.int.infra.auro.re/knotd.yml b/host_vars/ns-master.int.infra.auro.re/knotd.yml
index 940a4f2..a2faa4d 100644
--- a/host_vars/ns-master.int.infra.auro.re/knotd.yml
+++ b/host_vars/ns-master.int.infra.auro.re/knotd.yml
@@ -148,6 +148,9 @@ knotd__hosts:
     portail-gs:
       - 10.53.0.247
       - 2a09:6840:53::247
+    grocy.bric:
+      - 45.66.111.133
+      - 2a09:6840:111::133
 
   adh.auro.re:
     hoffman:
@@ -476,6 +479,9 @@ knotd__zones:
       mx.test:
         - 2a09:6840:211::1:5
         - 10.211.1.5
+      collabora.pub:
+        - 2a09:6840:128::220
+        - 10.128.0.220
 
   108.66.45.in-addr.arpa:
     dnssec_policy: ripe
diff --git a/hosts b/hosts
index 378ccf7..7e39c94 100644
--- a/hosts
+++ b/hosts
@@ -3,6 +3,9 @@
 [vm_test]
 mx.test.infra.auro.re
 
+[vm_services]
+collabora.pub.infra.auro.re
+
 [aruba]
 eb-1.acs.sw.infra.auro.re
 
diff --git a/playbooks/base.yml b/playbooks/base.yml
index 6da6f40..10850bd 100755
--- a/playbooks/base.yml
+++ b/playbooks/base.yml
@@ -3,6 +3,7 @@
 - hosts:
     - pve_network
     - vm_test
+    - vm_services
     - vm_network
   roles:
     - base_utils
diff --git a/playbooks/ifupdown2.yml b/playbooks/ifupdown2.yml
index 00b9e6e..648a1a4 100755
--- a/playbooks/ifupdown2.yml
+++ b/playbooks/ifupdown2.yml
@@ -2,6 +2,7 @@
 ---
 - hosts:
     - vm_test
+    - vm_services
     - vm_network
   roles:
     - ifupdown2
diff --git a/playbooks/openssh.yml b/playbooks/openssh.yml
index 2554047..f1bcd62 100755
--- a/playbooks/openssh.yml
+++ b/playbooks/openssh.yml
@@ -4,6 +4,7 @@
     - pve_network
     - vm_test
     - vm_network
+    - vm_services
   roles:
     - openssh_server
 ...
diff --git a/playbooks/root.yml b/playbooks/root.yml
index a63f1b9..5e2d034 100755
--- a/playbooks/root.yml
+++ b/playbooks/root.yml
@@ -3,6 +3,7 @@
 - hosts:
     - vm_network
     - vm_test
+    - vm_services
     - pve_network
   roles:
     - root_account
diff --git a/playbooks/systemd_link.yml b/playbooks/systemd_link.yml
index 6afa616..ed83672 100755
--- a/playbooks/systemd_link.yml
+++ b/playbooks/systemd_link.yml
@@ -12,6 +12,7 @@
     - isp
     - vpn
     - vm_test
+    - vm_services
   roles:
     - systemd_link
 ...
diff --git a/roles/base_utils/tasks/main.yml b/roles/base_utils/tasks/main.yml
index ff49b5d..83332e7 100644
--- a/roles/base_utils/tasks/main.yml
+++ b/roles/base_utils/tasks/main.yml
@@ -9,5 +9,4 @@
       - tcpdump
       - curl
       - iperf3
-      - iostat
 ...