From 56df06e98157bc71cdd3b9e23593b5352b2119b4 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Sat, 8 Jun 2024 18:50:55 +0200
Subject: [PATCH] clean up some nodefiles

---
 groups/locations.py           |  3 +++
 nodes/fkusei-locutus.py       |  6 ------
 nodes/home/nas.py             | 11 -----------
 nodes/home/router.py          |  4 ----
 nodes/htz-cloud/pirmasens.py  |  3 ---
 nodes/kunsi-p14s.py           |  3 ---
 nodes/sophie/backupserver.py  |  3 ---
 nodes/sophie/paperless.py     |  7 -------
 nodes/sophie/rechenmonster.py |  3 ---
 9 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/groups/locations.py b/groups/locations.py
index 3d40c99..00bf560 100644
--- a/groups/locations.py
+++ b/groups/locations.py
@@ -68,6 +68,9 @@ groups['sophie'] = {
         'icinga_options': {
             'exclude_from_monitoring': True,
         },
+        'users': {
+            'sophie': {},
+        },
     },
 }
 
diff --git a/nodes/fkusei-locutus.py b/nodes/fkusei-locutus.py
index f88830d..23118bd 100644
--- a/nodes/fkusei-locutus.py
+++ b/nodes/fkusei-locutus.py
@@ -121,12 +121,6 @@ nodes['fkusei-locutus'] = {
             'fkunsmann': {
                 'password': vault.decrypt('encrypt$gAAAAABgLmmuQGRUStrQawoPee-758emIYn2u8-8ebrgzNAFSp7ifeFDdXXvs-zL3QogwNYlCtBHboH2xfy1rSj6OF5bbNO-tg=='),
                 'shell': '/usr/bin/fish',
-                'sudo_commands': {
-                    'ALL',
-                },
-            },
-            'sophie': {
-                'delete': True,
             },
         },
         'voc-tracker-worker': {
diff --git a/nodes/home/nas.py b/nodes/home/nas.py
index 695941e..4afce46 100644
--- a/nodes/home/nas.py
+++ b/nodes/home/nas.py
@@ -223,9 +223,6 @@ nodes['home.nas'] = {
             'enable_x_forwarding_for_admins': True,
         },
         'users': {
-            'f2k1de': {
-                'delete': True,
-            },
             'inbox': {
                 'ssh_pubkey': {
                     #'command="/usr/share/rsync/scripts/rrsync -wo /storage/inbox/",no-agent-forwarding,no-port-forwarding,no-pty,no-user-rc,no-X11-forwarding ',
@@ -236,14 +233,6 @@ nodes['home.nas'] = {
                     'nas',
                 },
             },
-            'sophie': {
-                'groups': {
-                    'nas',
-                },
-            },
-            'qcn': {
-                'delete': True,
-            },
         },
         'zfs': {
             'module_options': {
diff --git a/nodes/home/router.py b/nodes/home/router.py
index 968477a..c84b4ef 100644
--- a/nodes/home/router.py
+++ b/nodes/home/router.py
@@ -146,11 +146,7 @@ nodes['home.router'] = {
             },
         },
         'users': {
-            'f2k1de': {
-                'delete': True,
-            },
             'fkunsmann': {},
-            'sophie': {},
         },
         'vnstat': {
             'interface': 'enp1s0.7',
diff --git a/nodes/htz-cloud/pirmasens.py b/nodes/htz-cloud/pirmasens.py
index 8aa5edf..b4c405d 100644
--- a/nodes/htz-cloud/pirmasens.py
+++ b/nodes/htz-cloud/pirmasens.py
@@ -83,9 +83,6 @@ nodes['htz-cloud.pirmasens'] = {
         'users': {
             'forgejo-carlene': {},
             'frank': {},
-            'sophie': {
-                'delete': True,
-            },
         },
         'vm': {
             'cpu': 2,
diff --git a/nodes/kunsi-p14s.py b/nodes/kunsi-p14s.py
index 5571633..7d377ab 100644
--- a/nodes/kunsi-p14s.py
+++ b/nodes/kunsi-p14s.py
@@ -162,9 +162,6 @@ nodes['kunsi-p14s'] = {
                 'password': vault.decrypt('encrypt$gAAAAABgLmmuQGRUStrQawoPee-758emIYn2u8-8ebrgzNAFSp7ifeFDdXXvs-zL3QogwNYlCtBHboH2xfy1rSj6OF5bbNO-tg=='),
                 'shell': '/usr/bin/fish',
             },
-            'sophie': {
-                'delete': True,
-            },
         },
         'wireguard': {
             'peers': {
diff --git a/nodes/sophie/backupserver.py b/nodes/sophie/backupserver.py
index 41a21c0..efabae1 100644
--- a/nodes/sophie/backupserver.py
+++ b/nodes/sophie/backupserver.py
@@ -46,9 +46,6 @@ nodes['htz-hel.backup-sophie'] = {
                 ],
             },
         },
-        'users': {
-            'sophie': {},
-        },
         'zfs': {
             'datasets': {
                 'tank/ejgwthink': {
diff --git a/nodes/sophie/paperless.py b/nodes/sophie/paperless.py
index 9463f06..9319c7a 100644
--- a/nodes/sophie/paperless.py
+++ b/nodes/sophie/paperless.py
@@ -61,13 +61,6 @@ nodes['sophie.paperless'] = {
         'postgresql': {
             'version': '11',
         },
-        'users': {
-            'sophie': {
-                'sudo_commands': {
-                    'ALL',
-                },
-            },
-        },
         'vm': {
             'cpu': 2,
             'ram': 2,
diff --git a/nodes/sophie/rechenmonster.py b/nodes/sophie/rechenmonster.py
index 699935d..34f6783 100644
--- a/nodes/sophie/rechenmonster.py
+++ b/nodes/sophie/rechenmonster.py
@@ -54,9 +54,6 @@ nodes['sophie.rechenmonster'] = {
             },
         },
         'users': {
-            'kunsi': {
-                'password': vault.decrypt('encrypt$gAAAAABgLmmuQGRUStrQawoPee-758emIYn2u8-8ebrgzNAFSp7ifeFDdXXvs-zL3QogwNYlCtBHboH2xfy1rSj6OF5bbNO-tg=='),
-            },
             'sophie': {
                 'password': vault.decrypt('encrypt$gAAAAABiEAyiedXL6ZnvelOMumhcB73X72SXZhjS_G0EDYVK5-NQ3_J_0h1W1HkFBNe5tShGNmg88jUiULRBn5u2IoiRGiDrYg=='),
             },