groups/locations/home.py

@@ -1 +0,0 @@
-{}

libs/ssh.py

@@ -1,23 +1,19 @@
 from base64 import b64decode, b64encode
-from hashlib import sha3_256
-
 from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey
-from cryptography.hazmat.primitives.serialization import Encoding, PrivateFormat, PublicFormat, NoEncryption
+from cryptography.hazmat.primitives import serialization
 
 
 def generate_ed25519_key_pair(secret):
     privkey_bytes = Ed25519PrivateKey.from_private_bytes(secret)
     
     nondeterministic_privatekey = privkey_bytes.private_bytes(
-        encoding=Encoding.PEM,
+        encoding=serialization.Encoding.PEM,
-        format=PrivateFormat.OpenSSH,
+        format=serialization.PrivateFormat.OpenSSH,
-        encryption_algorithm=NoEncryption()
+        encryption_algorithm=serialization.NoEncryption()
     ).decode()
-
-    # handle random 32bit number, occuring twice in a row
     nondeterministic_bytes = b64decode(''.join(nondeterministic_privatekey.split('\n')[1:-2]))
-    random_bytes = sha3_256(secret).digest()[0:4]
+    # handle random 32bit number, occuring twice in a row
-    deterministic_bytes = nondeterministic_bytes[:98] + random_bytes + random_bytes + nondeterministic_bytes[106:]
+    deterministic_bytes = nondeterministic_bytes[:98] + b'00000000' + nondeterministic_bytes[106:]
     deterministic_privatekey = '\n'.join([
         '-----BEGIN OPENSSH PRIVATE KEY-----',
         b64encode(deterministic_bytes).decode(),
@@ -25,8 +21,8 @@ def generate_ed25519_key_pair(secret):
     ])
 
     public_key = privkey_bytes.public_key().public_bytes(
-        encoding=Encoding.OpenSSH,
+        encoding=serialization.Encoding.OpenSSH,
-        format=PublicFormat.OpenSSH,
+        format=serialization.PublicFormat.OpenSSH,
     ).decode()
     
     return (deterministic_privatekey, public_key)

nodes/home.backups.py

@@ -1,11 +1,10 @@
 {
     'hostname': '10.0.0.5',
     'groups': [
-        'autologin',
-        'backup-server',
         'debian-11',
-        'home',
+        'backup-server',
         'monitored',
+        'autologin',
     ],
     'bundles': [
         'smartctl',

nodes/home.homematic.py

@@ -1,9 +1,8 @@
 {
     'hostname': '10.0.2.8',
     'groups': [
-        'autologin',
-        'home',
         'raspberrymatic',
+        'autologin',
     ],
     'bundles': [
         'hostname',

nodes/home.hue.py

@@ -1,8 +1,5 @@
 {
     'dummy': True,
-    'groups': [
-        'home',
-    ],
     'metadata': {
         'id': '',
         'network': {

nodes/home.openhab.py

@@ -1,13 +1,12 @@
 {
     'hostname': '10.0.0.17',
     'groups': [
-        'autologin',
         'backup',
         'debian-11',
-        'home',
         'monitored',
         'raspberry-pi',
         'webserver',
+        'autologin',
     ],
     'bundles': [
         'build-agent',

nodes/home.server.py

@@ -1,15 +1,14 @@
 {
     'hostname': '10.0.0.2',
     'groups': [
-        'autologin',
         'backup',
         'debian-11',
-        'home',
         'nextcloud',
         'monitored',
         'webserver',
         'hardware',
         'build-server',
+        'autologin',
     ],
     'bundles': [
         'apcupsd',

nodes/home.stromzaehler.py

@@ -1,11 +1,10 @@
 {
     'hostname': '10.0.0.15',
     'groups': [
-        'autologin',
         'debian-11',
-        'home',
         'raspberry-pi',
         'monitored',
+        'autologin',
     ],
     'bundles': [
        'stromzaehler',

nodes/home.unifi.py

@@ -1,8 +1,5 @@
 {
     'dummy': True,
-    'groups': [
-        'home',
-    ],
     'metadata': {
         'id': '',
         'network': {