From 43406c49fc8c3e8b3e94b57ef3fab7c273cecb47 Mon Sep 17 00:00:00 2001
From: Mark Janssen <mark@sig-io.nl>
Date: Wed, 24 Jul 2024 22:39:05 +0200
Subject: [PATCH] Add shell / enable nft on kvm

---
 group_vars/all.yaml | 8 ++++----
 group_vars/kvm.yaml | 2 --
 inventory           | 5 ++++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/group_vars/all.yaml b/group_vars/all.yaml
index b9f854d..928e710 100644
--- a/group_vars/all.yaml
+++ b/group_vars/all.yaml
@@ -10,16 +10,16 @@ trusted_ranges:
   - { v: ipv4, cidr: "172.16.0.0/12", comment: "rfc1918" }
   - { v: ipv4, cidr: "192.168.0.0/16", comment: "rfc1918" }
   - { v: ipv4, cidr: "45.88.49.140", comment: "vihamij" }
-  - { v: ipv4, cidr: "204.2.64.0/20", comment: "eventinfra" }
+  - { v: ipv4, cidr: "204.2.64.0/20", comment: "eventinfra / bitlair" }
   - { v: ipv4, cidr: "100.64.0.0/10", comment: "bitlair" }
-  - { v: ipv4, cidr: "185.205.52.194/32", comment: "bitlair" }
-  - { v: ipv4, cidr: "31.187.251.213/32", comment: "foobar" }
+  - { v: ipv4, cidr: "185.205.52.194/32", comment: "bitlair A2B" } # kan weg ??
+  - { v: ipv4, cidr: "31.187.251.213/32", comment: "foobar thuis" }
 #  - { v: ipv6, cidr: "::/0", comment: "ipv6 localhost" }
 #  - { v: ipv6, cidr: "fe80::/10", comment: "ipv6 link-local" }
 #  - { v: ipv6, cidr: "2a02:166b:92::/48", comment: "bitlair" } # /48's kunnen niet in de ipset
   - { v: ipv6, cidr: "2001:678:814:68::/64", comment: "bitlair wifi" }
   - { v: ipv6, cidr: "2a05:2d01:0:4042::/64", comment: "bitlair servers" }
-  - { v: ipv6, cidr: "2a0e:5700:4:2::/64", comment: "foobar" }
+  - { v: ipv6, cidr: "2a0e:5700:4:2::/64", comment: "foobar ipv6" }
 
 root_access:
   - ak
diff --git a/group_vars/kvm.yaml b/group_vars/kvm.yaml
index 9eed925..cd21505 100644
--- a/group_vars/kvm.yaml
+++ b/group_vars/kvm.yaml
@@ -1,4 +1,2 @@
 ---
 
-# FIXME: nog niet kunnen testen, en mogelijk non-default config nodig ;)
-nft: false
diff --git a/inventory b/inventory
index 7e430e1..5a50449 100644
--- a/inventory
+++ b/inventory
@@ -39,6 +39,9 @@ service.bitlair.nl
 [wiki]
 wiki.bitlair.nl
 
+[shell]
+shell.bitlair.nl
+
 [debian:children]
 bank
 fotos
@@ -51,4 +54,4 @@ monitoring
 music
 services
 wiki
-
+shell