move c4 users to users.toml

voc · Aug 16, 2024 · 492f070 · 492f070
1 parent d117247
commit 492f070
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 24 deletions.
diff --git a/bundlewrap/groups/rooms.py b/bundlewrap/groups/rooms.py
@@ -46,30 +46,18 @@
                 },
             },
         },
+        'nameservers': {
+            '172.23.23.1',
+        },
         'users': {
             'florob': {},
             'florolf': {},
             'ike': {},
-            'qb': {},
+            'kadse': {},
             'lukas2511': {},
-            'twix': {
-                    'uid': 2000,
-                    'ssh_pubkeys': [
-                            "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBmWzl45PCNsqsKxV3Ks4hjbUmkuICsKjE6maZKjW7oU twix@mars"
-                        ]
-                },
-            'kadse': {
-                    'uid': 2001,
-                    'ssh_pubkeys': [
-                            "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKmmtGeeNFRf4HKaAVThV3IjGWSJDcji33k4E98vOt5G kadse",
-                        ]
-                },
-            'snoopy': {
-                    'uid': 2002,
-                    'ssh_pubkeys': [
-                            "[email protected] AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIPCe7TJFPCWxRgSklbCPrYU4p/ANPV3t+98oh9+GIKS1AAAABHNzaDo= snoopy@woodstock",
-                        ]
-                },
+            'qb': {},
+            'snoopy': {},
+            'twix': {},
         },
     }
 )
diff --git a/bundlewrap/nodes/encoderc4.toml b/bundlewrap/nodes/encoderc4.toml
@@ -3,7 +3,6 @@ groups = ["debian-bookworm"]
 [metadata]
 hostname = "encoderc4.labor.koeln.ccc.de"
 do_not_import_default_users = true
-nameservers = [ '172.23.23.1' ]
 
 [metadata.crs-worker.secrets]
 encoding.secret = "!decrypt:encrypt$gAAAAABmhFbnelqRLAIVSSoulff5VhTMF4VwNWcQY1lFykx6ZBBKt7fgUJ1wK8N0koDCWdvpYv1njZCbX0czS9yG2k6lG1xKk7vcE8gbU8Lb7dAc-14Vv86rix8qIzk4cx482sRbzi7a"

diff --git a/users.toml b/users.toml
@@ -456,31 +456,31 @@ enable_rz = false
 enable_event = true
 uid = 1158
 ssh_pubkeys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAL9Sw6U8IhvmTt4ANtd9SqSGiiLCPeaK/ioFDEJzGSn martin entropia",
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAL9Sw6U8IhvmTt4ANtd9SqSGiiLCPeaK/ioFDEJzGSn",
 ]
 
 [thies]
 enable_rz = true
 enable_event = true
 uid = 1159
 ssh_pubkeys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBh9aUbLzxXjgRNSolu/P/WNXQoYtcAcTFeFTFUqH7zr thies",
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBh9aUbLzxXjgRNSolu/P/WNXQoYtcAcTFeFTFUqH7zr",
 ]
 
 [moira]
 enable_rz = false
 enable_event = true
 uid = 1160
 ssh_pubkeys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJrcJRF71+XM5YZj+SaSiGcdVZ0IDxGBXIWssDtHiTtr moira_2022_06",
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJrcJRF71+XM5YZj+SaSiGcdVZ0IDxGBXIWssDtHiTtr",
 ]
 
 [krobin]
 enable_rz = false
 enable_event = true
 uid = 1161
 ssh_pubkeys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILCty3i/MG4ehTN5JzY3UTtr/9q5L2eQinAGh1FClWIS trhetzner@oat"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILCty3i/MG4ehTN5JzY3UTtr/9q5L2eQinAGh1FClWIS",
 ]
 
 [simpel]
@@ -490,3 +490,27 @@ uid = 1162
 ssh_pubkeys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICMfqnvSSDoX0nLrHHnCaVzunwIT4LZY5kltcreRUxp1",
 ]
+
+[twix]
+enable_rz = false
+enable_event = true
+uid = 1163
+ssh_pubkeys = [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBmWzl45PCNsqsKxV3Ks4hjbUmkuICsKjE6maZKjW7oU",
+]
+
+[kadse]
+enable_rz = false
+enable_event = true
+uid = 1164
+ssh_pubkeys = [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKmmtGeeNFRf4HKaAVThV3IjGWSJDcji33k4E98vOt5G",
+]
+
+[snoopy]
+enable_rz = false
+enable_event = true
+uid = 1165
+ssh_pubkeys = [
+    "[email protected] AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIPCe7TJFPCWxRgSklbCPrYU4p/ANPV3t+98oh9+GIKS1AAAABHNzaDo=",
+]