From b4d1f07ed97fb079423687700b48073a2dca0622 Mon Sep 17 00:00:00 2001 From: pinpox Date: Sun, 19 Oct 2025 14:26:45 +0200 Subject: [PATCH 01/19] Fix borgbackup test name - Fix deprecated name structure - Re-generate vars --- clanServices/borgbackup/tests/vm/default.nix | 2 +- .../vm/vars/per-machine/clientone/state-version/version/value | 1 + .../vm/vars/per-machine/serverone/state-version/version/value | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 clanServices/borgbackup/tests/vm/vars/per-machine/clientone/state-version/version/value create mode 100644 clanServices/borgbackup/tests/vm/vars/per-machine/serverone/state-version/version/value diff --git a/clanServices/borgbackup/tests/vm/default.nix b/clanServices/borgbackup/tests/vm/default.nix index 518e8cb2b..689391c77 100644 --- a/clanServices/borgbackup/tests/vm/default.nix +++ b/clanServices/borgbackup/tests/vm/default.nix @@ -3,7 +3,7 @@ ... }: { - name = "service-borgbackup"; + name = "borgbackup"; clan = { directory = ./.; diff --git a/clanServices/borgbackup/tests/vm/vars/per-machine/clientone/state-version/version/value b/clanServices/borgbackup/tests/vm/vars/per-machine/clientone/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/borgbackup/tests/vm/vars/per-machine/clientone/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file diff --git a/clanServices/borgbackup/tests/vm/vars/per-machine/serverone/state-version/version/value b/clanServices/borgbackup/tests/vm/vars/per-machine/serverone/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/borgbackup/tests/vm/vars/per-machine/serverone/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file From 7d6d5967dcfc9b476a7bc93a4b32603253ad0488 Mon Sep 17 00:00:00 2001 From: pinpox Date: Sun, 19 Oct 2025 14:45:45 +0200 Subject: [PATCH 02/19] clanServices/data-mesher: fix deprecated test name - fix test name to new format - regenerate vars via update-vars --- clanServices/data-mesher/flake-module.nix | 2 +- clanServices/data-mesher/tests/vm/default.nix | 2 +- .../tests/vm/vars/per-machine/admin/state-version/version/value | 1 + .../tests/vm/vars/per-machine/peer/state-version/version/value | 1 + .../vm/vars/per-machine/signer/state-version/version/value | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 clanServices/data-mesher/tests/vm/vars/per-machine/admin/state-version/version/value create mode 100644 clanServices/data-mesher/tests/vm/vars/per-machine/peer/state-version/version/value create mode 100644 clanServices/data-mesher/tests/vm/vars/per-machine/signer/state-version/version/value diff --git a/clanServices/data-mesher/flake-module.nix b/clanServices/data-mesher/flake-module.nix index c738070a4..52fcc27ab 100644 --- a/clanServices/data-mesher/flake-module.nix +++ b/clanServices/data-mesher/flake-module.nix @@ -9,7 +9,7 @@ in perSystem = { ... }: { - clan.nixosTests.service-data-mesher = { + clan.nixosTests.data-mesher = { imports = [ ./tests/vm/default.nix ]; clan.modules."@clan/data-mesher" = module; }; diff --git a/clanServices/data-mesher/tests/vm/default.nix b/clanServices/data-mesher/tests/vm/default.nix index 7b0b7f8eb..1b5b56da9 100644 --- a/clanServices/data-mesher/tests/vm/default.nix +++ b/clanServices/data-mesher/tests/vm/default.nix @@ -2,7 +2,7 @@ ... }: { - name = "service-data-mesher"; + name = "data-mesher"; clan = { directory = ./.; diff --git a/clanServices/data-mesher/tests/vm/vars/per-machine/admin/state-version/version/value b/clanServices/data-mesher/tests/vm/vars/per-machine/admin/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/data-mesher/tests/vm/vars/per-machine/admin/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file diff --git a/clanServices/data-mesher/tests/vm/vars/per-machine/peer/state-version/version/value b/clanServices/data-mesher/tests/vm/vars/per-machine/peer/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/data-mesher/tests/vm/vars/per-machine/peer/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file diff --git a/clanServices/data-mesher/tests/vm/vars/per-machine/signer/state-version/version/value b/clanServices/data-mesher/tests/vm/vars/per-machine/signer/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/data-mesher/tests/vm/vars/per-machine/signer/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file From c725fc9fa365770ea69ed4355720fbad34a71b98 Mon Sep 17 00:00:00 2001 From: pinpox Date: Sun, 19 Oct 2025 14:49:27 +0200 Subject: [PATCH 03/19] clanServices/dyndns: fix deprecated test name - fix test name to new format - regenerate vars via update-vars --- clanServices/dyndns/tests/vm/default.nix | 2 +- .../tests/vm/sops/machines/server/key.json | 6 ++++++ .../vm/sops/secrets/server-age.key/secret | 14 ++++++++++++++ .../vm/sops/secrets/server-age.key/users/admin | 1 + .../dyndns/tests/vm/sops/users/admin/key.json | 4 ++++ .../server/state-version/version/value | 1 + .../machines/server | 1 + .../dyndns-namecheap-example.com/secret | 18 ++++++++++++++++++ .../dyndns-namecheap-example.com/users/admin | 1 + 9 files changed, 47 insertions(+), 1 deletion(-) create mode 100755 clanServices/dyndns/tests/vm/sops/machines/server/key.json create mode 100644 clanServices/dyndns/tests/vm/sops/secrets/server-age.key/secret create mode 120000 clanServices/dyndns/tests/vm/sops/secrets/server-age.key/users/admin create mode 100644 clanServices/dyndns/tests/vm/sops/users/admin/key.json create mode 100644 clanServices/dyndns/tests/vm/vars/per-machine/server/state-version/version/value create mode 120000 clanServices/dyndns/tests/vm/vars/shared/dyndns-namecheap-example.com/dyndns-namecheap-example.com/machines/server create mode 100644 clanServices/dyndns/tests/vm/vars/shared/dyndns-namecheap-example.com/dyndns-namecheap-example.com/secret create mode 120000 clanServices/dyndns/tests/vm/vars/shared/dyndns-namecheap-example.com/dyndns-namecheap-example.com/users/admin diff --git a/clanServices/dyndns/tests/vm/default.nix b/clanServices/dyndns/tests/vm/default.nix index 8c1e8f919..22ca99f0c 100644 --- a/clanServices/dyndns/tests/vm/default.nix +++ b/clanServices/dyndns/tests/vm/default.nix @@ -3,7 +3,7 @@ ... }: { - name = "service-dyndns"; + name = "dyndns"; clan = { directory = ./.; diff --git a/clanServices/dyndns/tests/vm/sops/machines/server/key.json b/clanServices/dyndns/tests/vm/sops/machines/server/key.json new file mode 100755 index 000000000..41786e32c --- /dev/null +++ b/clanServices/dyndns/tests/vm/sops/machines/server/key.json @@ -0,0 +1,6 @@ +[ + { + "publickey": "age164wrhlnake7f7duhzs936lq6w49dtg53hcdyxqwxj0agad6tqg2s2u4yta", + "type": "age" + } +] \ No newline at end of file diff --git a/clanServices/dyndns/tests/vm/sops/secrets/server-age.key/secret b/clanServices/dyndns/tests/vm/sops/secrets/server-age.key/secret new file mode 100644 index 000000000..c41c6c204 --- /dev/null +++ b/clanServices/dyndns/tests/vm/sops/secrets/server-age.key/secret @@ -0,0 +1,14 @@ +{ + "data": "ENC[AES256_GCM,data:seLxbv590dO0KvMJmtN7WVvUcH27VYwAc3rmyD7q6ZmwCgswOKx55LFnh0stRDKSZa8K7Dq1x7D9adhZtPAMWX8tbJswBeNMPt8=,iv:G52eugxfTi0tTzH4EN4CWmpyv6feSL34++UVSjb0aAo=,tag:6r10/a7kD2hBAmae0nz2OQ==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHVC8wZUZJYUl5MXVNa2k5\ndGV1MnFWbUNLNVdxeEtCVUc3MTd0ck9aeFFBCnFhZW40amVYc3FlN1FPRTFSWTJR\nQzhNOERKbnRnSlJVeElNSEM5ZUJsZGsKLS0tIG1uNnlNN3MweHlYczNRTW9xSytu\neThzUmxKZTJBT2lCcTdiNUI4N3paTVEKgS9j2/GVt1KBoggUj9d6UK/mIlK4niLQ\nzVq2BHt3irxQpkpGUogXH2b86zSAOEJFzsL1Rk8HM1mogTG8jqf0qA==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-10-19T12:49:11Z", + "mac": "ENC[AES256_GCM,data:T/2xw2mvUi8YALyxz78qG/g/xguoUTeHNzcZfXwwSyCXMg9ircsGGLO9SOVWy/QNkibnw3Yp80tXNJyr4oJH28PhFH7RrRp8jzNdopF49ZNJb2IqJ3C7xNYRZMHfjOCd/raka+ehZq8YGilEpXUWLRk1ere9lbBMh1ycL7jJS3c=,iv:FZbY/jTNPM+p4qD41FD0K7B9zoppGuvnUY5hL/EkmYM=,tag:IF5QTyUkHXWthlAGBn9R8w==,type:str]", + "version": "3.11.0" + } +} diff --git a/clanServices/dyndns/tests/vm/sops/secrets/server-age.key/users/admin b/clanServices/dyndns/tests/vm/sops/secrets/server-age.key/users/admin new file mode 120000 index 000000000..9e21a9938 --- /dev/null +++ b/clanServices/dyndns/tests/vm/sops/secrets/server-age.key/users/admin @@ -0,0 +1 @@ +../../../users/admin \ No newline at end of file diff --git a/clanServices/dyndns/tests/vm/sops/users/admin/key.json b/clanServices/dyndns/tests/vm/sops/users/admin/key.json new file mode 100644 index 000000000..e408aa96b --- /dev/null +++ b/clanServices/dyndns/tests/vm/sops/users/admin/key.json @@ -0,0 +1,4 @@ +{ + "publickey": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", + "type": "age" +} diff --git a/clanServices/dyndns/tests/vm/vars/per-machine/server/state-version/version/value b/clanServices/dyndns/tests/vm/vars/per-machine/server/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/dyndns/tests/vm/vars/per-machine/server/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file diff --git a/clanServices/dyndns/tests/vm/vars/shared/dyndns-namecheap-example.com/dyndns-namecheap-example.com/machines/server b/clanServices/dyndns/tests/vm/vars/shared/dyndns-namecheap-example.com/dyndns-namecheap-example.com/machines/server new file mode 120000 index 000000000..c328f1963 --- /dev/null +++ b/clanServices/dyndns/tests/vm/vars/shared/dyndns-namecheap-example.com/dyndns-namecheap-example.com/machines/server @@ -0,0 +1 @@ +../../../../../sops/machines/server \ No newline at end of file diff --git a/clanServices/dyndns/tests/vm/vars/shared/dyndns-namecheap-example.com/dyndns-namecheap-example.com/secret b/clanServices/dyndns/tests/vm/vars/shared/dyndns-namecheap-example.com/dyndns-namecheap-example.com/secret new file mode 100644 index 000000000..1d3aa465c --- /dev/null +++ b/clanServices/dyndns/tests/vm/vars/shared/dyndns-namecheap-example.com/dyndns-namecheap-example.com/secret @@ -0,0 +1,18 @@ +{ + "data": "ENC[AES256_GCM,data:Zu+n+DDYP7rQRTS17PJ6Apo=,iv:5WOs81Pj+S85kdC1AlOXSyPMGDfwM5UD8x7nyRZtRYQ=,tag:2JYkGnLugAni49Upv43o2g==,type:str]", + "sops": { + "age": [ + { + "recipient": "age164wrhlnake7f7duhzs936lq6w49dtg53hcdyxqwxj0agad6tqg2s2u4yta", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlR3RGQ2ZLTkR3ZWxNVCsv\naXJHRjBiVUVYZVRIY2swY2xubGhmb3pLRkNvCldhQUV2WDlqYjZ4ZUFWYXkvUEEw\nZi9XRWw0Mi9mRENDcnI0aENDR2Z4MHcKLS0tIGFQU3Q4WEErbnBjOHpNR1BSR2cr\nRFg0anE1cHExT0sySmxuUks1R05nczAKZO3R6+f9co2+YGO8HPufoq1fLqqrdTWD\n4zqemMmG2BjMRDumxtcKp8CLaZWlJoP4e/+tonfdoe42qmNF5NJcFw==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzZWo4WGh1cWxKeDhDdlBm\nTVFjVFBIUU9xaGRkanNHaUVUUHN1czNRSUhNCkp5MmwzSGdycmsrZGhaRUhEbXBF\nNUhtdEF6bHZQOGJYUVhFVHlYc3FPODAKLS0tIDBRQ2VGT2IvU1F4MEVabzhYSFJq\nOWZmbGpkQmNSMnNKa0s4K2JXdGgwRlkKUQRREpG5H1mNHSc/cZrdMiSz0veJFR4N\n+W49XL/wQUZwajykwYj++G+dWDO7DQ+fpbB9w4mzbsAmCsXirseTLA==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-10-19T12:49:11Z", + "mac": "ENC[AES256_GCM,data:0msda7WbQQxXQ+juT7yErgT7NADgnzqEZLTQw+4JPuAE4xcqRIYwrrAALaA0GCCM2aIWlICzJigLCuzQUfSUbIzeP79tEHiKez+NOt/xgSM9ljz7GlsmLd0vzkxdt3WSxP+sHxy0S866N2sLMUkLqPGdqeTjB+Jji5ghGhzk9ys=,iv:8UU7iA4SdR6ZlVolm708l2Iea0sQYRT+5wPBBP5tpS0=,tag:VQXslAlqLqs1QEkwW6x6qg==,type:str]", + "version": "3.11.0" + } +} diff --git a/clanServices/dyndns/tests/vm/vars/shared/dyndns-namecheap-example.com/dyndns-namecheap-example.com/users/admin b/clanServices/dyndns/tests/vm/vars/shared/dyndns-namecheap-example.com/dyndns-namecheap-example.com/users/admin new file mode 120000 index 000000000..f14859ae0 --- /dev/null +++ b/clanServices/dyndns/tests/vm/vars/shared/dyndns-namecheap-example.com/dyndns-namecheap-example.com/users/admin @@ -0,0 +1 @@ +../../../../../sops/users/admin \ No newline at end of file From d3d56e83e73672db48628f6e534331ba723436a2 Mon Sep 17 00:00:00 2001 From: pinpox Date: Sun, 19 Oct 2025 14:50:05 +0200 Subject: [PATCH 04/19] clanServices/garage: fix deprecated test name - fix test name to new format - regenerate vars via update-vars --- clanServices/garage/tests/vm/default.nix | 2 +- .../vm/vars/per-machine/server/state-version/version/value | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 clanServices/garage/tests/vm/vars/per-machine/server/state-version/version/value diff --git a/clanServices/garage/tests/vm/default.nix b/clanServices/garage/tests/vm/default.nix index d4aefe05a..8bab09788 100644 --- a/clanServices/garage/tests/vm/default.nix +++ b/clanServices/garage/tests/vm/default.nix @@ -3,7 +3,7 @@ ... }: { - name = "service-garage"; + name = "garage"; clan = { directory = ./.; diff --git a/clanServices/garage/tests/vm/vars/per-machine/server/state-version/version/value b/clanServices/garage/tests/vm/vars/per-machine/server/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/garage/tests/vm/vars/per-machine/server/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file From 31f77f7a56396653d191ba8dfdb76db8a89d85c0 Mon Sep 17 00:00:00 2001 From: pinpox Date: Sun, 19 Oct 2025 14:50:19 +0200 Subject: [PATCH 05/19] clanServices/hello-world: fix deprecated test name - fix test name to new format --- clanServices/hello-world/tests/vm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clanServices/hello-world/tests/vm/default.nix b/clanServices/hello-world/tests/vm/default.nix index 0f641444b..b76b00309 100644 --- a/clanServices/hello-world/tests/vm/default.nix +++ b/clanServices/hello-world/tests/vm/default.nix @@ -1,5 +1,5 @@ { - name = "service-hello-service"; + name = "hello-service"; clan = { directory = ./.; From 0cc7bd70666e0d67cd2440e2122e8ae73951ee80 Mon Sep 17 00:00:00 2001 From: pinpox Date: Sun, 19 Oct 2025 14:50:50 +0200 Subject: [PATCH 06/19] clanServices/localbackup: fix deprecated test name - fix test name to new format - regenerate vars via update-vars --- clanServices/localbackup/tests/vm/default.nix | 2 +- clanServices/localbackup/tests/vm/sops/users/admin/key.json | 4 ++++ .../vm/vars/per-machine/machine/state-version/version/value | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 clanServices/localbackup/tests/vm/sops/users/admin/key.json create mode 100644 clanServices/localbackup/tests/vm/vars/per-machine/machine/state-version/version/value diff --git a/clanServices/localbackup/tests/vm/default.nix b/clanServices/localbackup/tests/vm/default.nix index 2a266303e..6df78f697 100644 --- a/clanServices/localbackup/tests/vm/default.nix +++ b/clanServices/localbackup/tests/vm/default.nix @@ -1,6 +1,6 @@ { ... }: { - name = "service-localbackup"; + name = "localbackup"; clan = { directory = ./.; diff --git a/clanServices/localbackup/tests/vm/sops/users/admin/key.json b/clanServices/localbackup/tests/vm/sops/users/admin/key.json new file mode 100644 index 000000000..e408aa96b --- /dev/null +++ b/clanServices/localbackup/tests/vm/sops/users/admin/key.json @@ -0,0 +1,4 @@ +{ + "publickey": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", + "type": "age" +} diff --git a/clanServices/localbackup/tests/vm/vars/per-machine/machine/state-version/version/value b/clanServices/localbackup/tests/vm/vars/per-machine/machine/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/localbackup/tests/vm/vars/per-machine/machine/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file From ae4197277a70778b88fa8044517f3f0d69183da5 Mon Sep 17 00:00:00 2001 From: pinpox Date: Sun, 19 Oct 2025 14:51:22 +0200 Subject: [PATCH 07/19] clanServices/mycelium: fix deprecated test name - fix test name to new format - regenerate vars via update-vars --- clanServices/mycelium/tests/vm/default.nix | 2 +- .../vm/vars/per-machine/server/state-version/version/value | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 clanServices/mycelium/tests/vm/vars/per-machine/server/state-version/version/value diff --git a/clanServices/mycelium/tests/vm/default.nix b/clanServices/mycelium/tests/vm/default.nix index 28ff0c8a6..fd6727fe4 100644 --- a/clanServices/mycelium/tests/vm/default.nix +++ b/clanServices/mycelium/tests/vm/default.nix @@ -3,7 +3,7 @@ ... }: { - name = "service-mycelium"; + name = "mycelium"; clan = { test.useContainers = false; diff --git a/clanServices/mycelium/tests/vm/vars/per-machine/server/state-version/version/value b/clanServices/mycelium/tests/vm/vars/per-machine/server/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/mycelium/tests/vm/vars/per-machine/server/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file From c36935d81a98bedc73423531e974bbf167b3983b Mon Sep 17 00:00:00 2001 From: pinpox Date: Sun, 19 Oct 2025 14:51:54 +0200 Subject: [PATCH 08/19] clanServices/packages: fix deprecated test name - fix test name to new format - regenerate vars via update-vars --- clanServices/packages/tests/vm/default.nix | 2 +- .../vm/vars/per-machine/server/state-version/version/value | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 clanServices/packages/tests/vm/vars/per-machine/server/state-version/version/value diff --git a/clanServices/packages/tests/vm/default.nix b/clanServices/packages/tests/vm/default.nix index 07421949e..50705ca00 100644 --- a/clanServices/packages/tests/vm/default.nix +++ b/clanServices/packages/tests/vm/default.nix @@ -1,5 +1,5 @@ { - name = "service-packages"; + name = "packages"; clan = { directory = ./.; diff --git a/clanServices/packages/tests/vm/vars/per-machine/server/state-version/version/value b/clanServices/packages/tests/vm/vars/per-machine/server/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/packages/tests/vm/vars/per-machine/server/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file From 965d41b37dc296f209755da490effb5864691652 Mon Sep 17 00:00:00 2001 From: pinpox Date: Sun, 19 Oct 2025 14:52:08 +0200 Subject: [PATCH 09/19] clanServices/sshd: fix deprecated test name - fix test name to new format --- clanServices/sshd/tests/vm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clanServices/sshd/tests/vm/default.nix b/clanServices/sshd/tests/vm/default.nix index e4632ccea..4919622ea 100644 --- a/clanServices/sshd/tests/vm/default.nix +++ b/clanServices/sshd/tests/vm/default.nix @@ -3,7 +3,7 @@ ... }: { - name = "service-sshd"; + name = "sshd"; clan = { directory = ./.; From 046cfcb4d7186f437555a6cafb4d75680c6ae700 Mon Sep 17 00:00:00 2001 From: pinpox Date: Sun, 19 Oct 2025 14:52:21 +0200 Subject: [PATCH 10/19] clanServices/syncthing: fix deprecated test name - fix test name to new format --- clanServices/syncthing/tests/vm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clanServices/syncthing/tests/vm/default.nix b/clanServices/syncthing/tests/vm/default.nix index d6b9c15f0..ee75ca91b 100644 --- a/clanServices/syncthing/tests/vm/default.nix +++ b/clanServices/syncthing/tests/vm/default.nix @@ -1,5 +1,5 @@ { - name = "service-syncthing-service"; + name = "syncthing-service"; clan = { directory = ./.; From 612275477ac0006744e1f615aa39552a727ccd03 Mon Sep 17 00:00:00 2001 From: pinpox Date: Sun, 19 Oct 2025 14:52:55 +0200 Subject: [PATCH 11/19] clanServices/users: fix deprecated test name - fix test name to new format - regenerate vars via update-vars --- clanServices/users/tests/vm/default.nix | 2 +- .../vm/vars/per-machine/server/state-version/version/value | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 clanServices/users/tests/vm/vars/per-machine/server/state-version/version/value diff --git a/clanServices/users/tests/vm/default.nix b/clanServices/users/tests/vm/default.nix index d9781a448..0b915f70b 100644 --- a/clanServices/users/tests/vm/default.nix +++ b/clanServices/users/tests/vm/default.nix @@ -1,5 +1,5 @@ { - name = "service-users"; + name = "users"; clan = { directory = ./.; diff --git a/clanServices/users/tests/vm/vars/per-machine/server/state-version/version/value b/clanServices/users/tests/vm/vars/per-machine/server/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/users/tests/vm/vars/per-machine/server/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file From 87aa62e128ea34654f6f88d753d6f2cdc1356630 Mon Sep 17 00:00:00 2001 From: pinpox Date: Sun, 19 Oct 2025 14:53:48 +0200 Subject: [PATCH 12/19] clanServices/wifi: fix deprecated test name - fix test name to new format - regenerate vars via update-vars --- clanServices/wifi/tests/vm/default.nix | 2 +- .../tests/vm/sops/machines/second/key.json | 6 ++++++ .../vm/sops/secrets/second-age.key/secret | 14 ++++++++++++++ .../vm/sops/secrets/second-age.key/users/admin | 1 + .../second/state-version/version/value | 1 + .../test/state-version/version/value | 1 + .../wifi.all/network-name/machines/second | 1 + .../vars/shared/wifi.all/network-name/secret | 18 ++++++++++++++++++ .../shared/wifi.all/network-name/users/admin | 1 + .../shared/wifi.all/password/machines/second | 1 + .../vm/vars/shared/wifi.all/password/secret | 18 ++++++++++++++++++ .../vars/shared/wifi.all/password/users/admin | 1 + .../wifi.one/network-name/machines/second | 1 + .../vars/shared/wifi.one/network-name/secret | 12 ++++++++---- .../shared/wifi.one/password/machines/second | 1 + .../vm/vars/shared/wifi.one/password/secret | 12 ++++++++---- 16 files changed, 82 insertions(+), 9 deletions(-) create mode 100755 clanServices/wifi/tests/vm/sops/machines/second/key.json create mode 100644 clanServices/wifi/tests/vm/sops/secrets/second-age.key/secret create mode 120000 clanServices/wifi/tests/vm/sops/secrets/second-age.key/users/admin create mode 100644 clanServices/wifi/tests/vm/vars/per-machine/second/state-version/version/value create mode 100644 clanServices/wifi/tests/vm/vars/per-machine/test/state-version/version/value create mode 120000 clanServices/wifi/tests/vm/vars/shared/wifi.all/network-name/machines/second create mode 100644 clanServices/wifi/tests/vm/vars/shared/wifi.all/network-name/secret create mode 120000 clanServices/wifi/tests/vm/vars/shared/wifi.all/network-name/users/admin create mode 120000 clanServices/wifi/tests/vm/vars/shared/wifi.all/password/machines/second create mode 100644 clanServices/wifi/tests/vm/vars/shared/wifi.all/password/secret create mode 120000 clanServices/wifi/tests/vm/vars/shared/wifi.all/password/users/admin create mode 120000 clanServices/wifi/tests/vm/vars/shared/wifi.one/network-name/machines/second create mode 120000 clanServices/wifi/tests/vm/vars/shared/wifi.one/password/machines/second diff --git a/clanServices/wifi/tests/vm/default.nix b/clanServices/wifi/tests/vm/default.nix index 6f82932ab..99534aed4 100644 --- a/clanServices/wifi/tests/vm/default.nix +++ b/clanServices/wifi/tests/vm/default.nix @@ -1,5 +1,5 @@ { - name = "service-wifi"; + name = "wifi"; clan = { directory = ./.; diff --git a/clanServices/wifi/tests/vm/sops/machines/second/key.json b/clanServices/wifi/tests/vm/sops/machines/second/key.json new file mode 100755 index 000000000..822a69d96 --- /dev/null +++ b/clanServices/wifi/tests/vm/sops/machines/second/key.json @@ -0,0 +1,6 @@ +[ + { + "publickey": "age1afr59kwlpuapv2g9m0sa4k9yc22ulj7zcway538z7nnsgvf2re5qd7k03a", + "type": "age" + } +] \ No newline at end of file diff --git a/clanServices/wifi/tests/vm/sops/secrets/second-age.key/secret b/clanServices/wifi/tests/vm/sops/secrets/second-age.key/secret new file mode 100644 index 000000000..ab36a5189 --- /dev/null +++ b/clanServices/wifi/tests/vm/sops/secrets/second-age.key/secret @@ -0,0 +1,14 @@ +{ + "data": "ENC[AES256_GCM,data:xAQ6TcwttQNb1BXlq2j+xZX+vGbqV5XKZyZMBAnQ00hWLu6Ba6pN2qR4HItKQ1KWza8WGhzgGdcwZv6Qobgmp9wAcwWlAubS7FU=,iv:KalRsDqWxqscJOeZcnQfFkP7QTBVZpP8XAdPHvikfaM=,tag:EAndFTqRYRcCgD5/ixniBA==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjZnpWd0grazhjak0ra3NK\nSEpVTWVEaXEzc3ZIeloySXBqVk01SVNsVmtzCk5weWJCSGNlb2FRM0RWVEYwTHlC\nTVFBd1cvYlZrNlQ4TFRydFNzWXNicE0KLS0tIFZ5WllRNEI0Q3hQaVU2WjhGNDFr\nLy9pSXU5Y2FINy9LbXg4dzdHREQveE0KyxWDDyRpo0eTIXj0lHQtOunLtAP/Q+70\n+GvfjW7WXHXvXyg6CXzpCy6F6UWie4LHO9VrJM2mTjoh+q4l5DT6CA==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-10-19T12:53:35Z", + "mac": "ENC[AES256_GCM,data:P6Wcm7daPMe6laceFIiIzhcGa9k37Fo5ZnBFhdVmkATuR2oqMZp9Ke5r73SbC5B95QoPnWVNNnrxkn/oiVQmSiiDaf718isLAfU+7zGkV0BZCtfCrqe82JzH2iQ0tKSxsVJqklCijAfUBGpt/EYN6c4QnM2IFulbiWs2kqWMi4I=,iv:mRuTg2RblZCNX3yQNFKCtuwjwIptZ5VGpSyLV6Ah5NI=,tag:Xl8/jrtIhxfAi+FrnwKh7Q==,type:str]", + "version": "3.11.0" + } +} diff --git a/clanServices/wifi/tests/vm/sops/secrets/second-age.key/users/admin b/clanServices/wifi/tests/vm/sops/secrets/second-age.key/users/admin new file mode 120000 index 000000000..9e21a9938 --- /dev/null +++ b/clanServices/wifi/tests/vm/sops/secrets/second-age.key/users/admin @@ -0,0 +1 @@ +../../../users/admin \ No newline at end of file diff --git a/clanServices/wifi/tests/vm/vars/per-machine/second/state-version/version/value b/clanServices/wifi/tests/vm/vars/per-machine/second/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/wifi/tests/vm/vars/per-machine/second/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file diff --git a/clanServices/wifi/tests/vm/vars/per-machine/test/state-version/version/value b/clanServices/wifi/tests/vm/vars/per-machine/test/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/wifi/tests/vm/vars/per-machine/test/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file diff --git a/clanServices/wifi/tests/vm/vars/shared/wifi.all/network-name/machines/second b/clanServices/wifi/tests/vm/vars/shared/wifi.all/network-name/machines/second new file mode 120000 index 000000000..8333cc26c --- /dev/null +++ b/clanServices/wifi/tests/vm/vars/shared/wifi.all/network-name/machines/second @@ -0,0 +1 @@ +../../../../../sops/machines/second \ No newline at end of file diff --git a/clanServices/wifi/tests/vm/vars/shared/wifi.all/network-name/secret b/clanServices/wifi/tests/vm/vars/shared/wifi.all/network-name/secret new file mode 100644 index 000000000..51a9b3144 --- /dev/null +++ b/clanServices/wifi/tests/vm/vars/shared/wifi.all/network-name/secret @@ -0,0 +1,18 @@ +{ + "data": "ENC[AES256_GCM,data:B08uqk2DxB8QJ93QBM71,iv:XawCB0nwWxso5+yC8az33cFnt/qKzITOwUP0ZFI20Ho=,tag:mZg5U4t9beHch+Oic2VsVw==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1afr59kwlpuapv2g9m0sa4k9yc22ulj7zcway538z7nnsgvf2re5qd7k03a", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLWEV0STNnMlRreElVSk1y\nRTB6cCtWc0tkNUEycklSU0x5cHZwN3FIQkcwCkJQemRZOWZFSit3QmZ2a3RrOGFh\nUEhLSEZLRW9lWkN2b1VKK2EybUYvcTQKLS0tIGt6VWFmVHpNc2c0T3E0TjBYeWp1\ncjFCcEd3MTlYVGRsRlpXWWRsWlU0dkEKe5NUijC+GVxzj8bMEY6v+qHw9iylpwQz\nFLKneLikKVcRYoTYecimaQdUbYCiEwUB7KCpENcNmjZx6eVmTvGeMQ==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6T1hheHNaZ2h6Mlc5WEJq\nUk8zTC82N2ZHUUJQK0VLdXBkNEFnNlRHamh3CitrWGpVVGQreDRZdTF5L2VXNENn\neThUd0tjUWpCNW01QklZakx6NnNoT28KLS0tIGVOLytqUGtsaWhFbi9mU2ttMmow\nOFhwVmkyVDdZK09ramZOYktFdkV5R1EKWGseGbOtLS45gb6fb8LFzlfdsRGC7x9B\ncn03oAcfC2Yo/kqoT4tjQF/COn408SBkytwZ3GbL8Bnul/RyjcHJNQ==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-10-19T12:53:38Z", + "mac": "ENC[AES256_GCM,data:MneMlobCnJZVn5QEwxL1os48TOJhrfETry39G2Si1kT5OKq6SlNB2mtVOshmGv21Cue/JNZWr9kwO0SS4egs4CsWaW8MMoR+84KIGIu9uol3vieEayd8nOjJfCKp0fRQKi1ElJRUtjLApA1KQ05WjG+vlb2JxNl67NWRqtykA44=,iv:f91eVJiSfmvM9ym8a3VYlijNZW5SoGUCUqAgFEax6Bo=,tag:ciANv3ov6p0gCJTIQwBoJg==,type:str]", + "version": "3.11.0" + } +} diff --git a/clanServices/wifi/tests/vm/vars/shared/wifi.all/network-name/users/admin b/clanServices/wifi/tests/vm/vars/shared/wifi.all/network-name/users/admin new file mode 120000 index 000000000..f14859ae0 --- /dev/null +++ b/clanServices/wifi/tests/vm/vars/shared/wifi.all/network-name/users/admin @@ -0,0 +1 @@ +../../../../../sops/users/admin \ No newline at end of file diff --git a/clanServices/wifi/tests/vm/vars/shared/wifi.all/password/machines/second b/clanServices/wifi/tests/vm/vars/shared/wifi.all/password/machines/second new file mode 120000 index 000000000..8333cc26c --- /dev/null +++ b/clanServices/wifi/tests/vm/vars/shared/wifi.all/password/machines/second @@ -0,0 +1 @@ +../../../../../sops/machines/second \ No newline at end of file diff --git a/clanServices/wifi/tests/vm/vars/shared/wifi.all/password/secret b/clanServices/wifi/tests/vm/vars/shared/wifi.all/password/secret new file mode 100644 index 000000000..2ed786037 --- /dev/null +++ b/clanServices/wifi/tests/vm/vars/shared/wifi.all/password/secret @@ -0,0 +1,18 @@ +{ + "data": "ENC[AES256_GCM,data:PCpXPkFa5FzHArW1/g3QF9A=,iv:yKGtX4ZqiFYE/bvMAEIUmGQB7Oklo++vbed+K2JPxuA=,tag:UiiuchttMIv+T2TuXcpjZg==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1afr59kwlpuapv2g9m0sa4k9yc22ulj7zcway538z7nnsgvf2re5qd7k03a", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvcGJEM3ZLYUJleStRWkpy\nSmwzZXVXWUZTY2htbzk0UGlxV2gwWExyT21nCjRGYmFyRnNBYnJQa0hSRGtCZDdG\nTjdHMG94Q3diZnVsRy84TXJXKzJrTW8KLS0tIEF2dk1uSW5NQ0JxRFdmczNSYmJF\nRThyTnY5QVlOTEZ4eThpdEJmOFhvVFEKA7oltxLLS3w3LOOS2S4RZNJreZftJD2m\niXtDAfWOKLGYTdhfttzWWfxFHt/72OCL1WKm1COgmzBznJJ+RBehEw==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5ZmZ3d0xNRkQycnFaM2pB\nL1ZLeVRFQXozeGFpMGtnc1FBR20ycXl2UmxvCk42QVVieC8waDBwenhVdVFTc2M0\nL2lSM0QvUzhDMXFjTVVnZGY2YXcxakUKLS0tIHZiTGZsMEZ3elVkK2p2Q1kyNXFZ\nTmJybzJaSnZyZE5sb2ZPUjZyNjRhak0KjIyzfPw1BHYJ5REWRSoKG9cY2b23dbdt\ndHioloXv3tW5bTSWytuDSQ5+xzruJqr1w099EZ6Gl6aeeo0oQQkpyw==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-10-19T12:53:38Z", + "mac": "ENC[AES256_GCM,data:jtj+zGk6D+a+R45wmWD/g2lNWfAPCAAXtwPxZLOOYVZ0IizwqOhsQ6IYtGvKqty0nsr//pCihhazJGFSiGT4fDv6eYOO83+JLTWdvHbfJjMCPsD+Shbjenu/m8dbifsEcnrLkAgzMin2nOeUdRombz91K7O8hbDrcIkS0AXh5G4=,iv:G0l+5SkAj5ii4Us+WG1/xWspglD0xa7viKyZQt2nF9Q=,tag:F48Ry3rmB/Y6nHyikB5Pjw==,type:str]", + "version": "3.11.0" + } +} diff --git a/clanServices/wifi/tests/vm/vars/shared/wifi.all/password/users/admin b/clanServices/wifi/tests/vm/vars/shared/wifi.all/password/users/admin new file mode 120000 index 000000000..f14859ae0 --- /dev/null +++ b/clanServices/wifi/tests/vm/vars/shared/wifi.all/password/users/admin @@ -0,0 +1 @@ +../../../../../sops/users/admin \ No newline at end of file diff --git a/clanServices/wifi/tests/vm/vars/shared/wifi.one/network-name/machines/second b/clanServices/wifi/tests/vm/vars/shared/wifi.one/network-name/machines/second new file mode 120000 index 000000000..8333cc26c --- /dev/null +++ b/clanServices/wifi/tests/vm/vars/shared/wifi.one/network-name/machines/second @@ -0,0 +1 @@ +../../../../../sops/machines/second \ No newline at end of file diff --git a/clanServices/wifi/tests/vm/vars/shared/wifi.one/network-name/secret b/clanServices/wifi/tests/vm/vars/shared/wifi.one/network-name/secret index fa59b60ac..959f89b0b 100644 --- a/clanServices/wifi/tests/vm/vars/shared/wifi.one/network-name/secret +++ b/clanServices/wifi/tests/vm/vars/shared/wifi.one/network-name/secret @@ -3,12 +3,16 @@ "sops": { "age": [ { - "recipient": "age13ahclyps97532zt2sfta5zrfx976d3r2jmctj8d36vj9x5v5ffqq304fqf", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxN2EwVHN3SENVTjdjZGRi\nQmJOWlNGYmpmM1BnZnpYWGhaSlRaUVJIODFRCkhhMUhyZzVWWk53SDBwSVBVZGVY\nVUpMTm9qWTIzc3VwdGJHcUVWVzFlV0UKLS0tIDBBVXdlS1FFbzNPSnlZWWtEaDJi\nK215OWQvMVRCRUZyQjFZckJFbHBZeDQK2cqgDnGM5uIm834dbQ3bi3nQA5nPq6Bf\n0+sezXuY55GdFS6OxIgI5/KcitHzDE0WHOvklIGDCSysoXIQ3QXanA==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUdDNFSE8zdm00QTc1L3kx\nUkZYMFRwVTZkZDQxZTZEWlZBV2pSZ1NidGxvCk5MRE5Da0I1R0MxRzBFYVpNNWwz\nNGdDazh4cll5MHlDUGZ4N1lZb242UlUKLS0tIFBwWVhpS1JEc2JBWDZKdFBCUUF3\nRlVRZTR4YW93SXZlNXhjWlFDYnd5UEEKcZ7sbVO4ZhhTV4pNinJhk7+qWk4nr2E9\nvjQCXZvAMhXP485S+Dbiuvc426cOOL+KrOelMFRJgZg3sDtuN4AFLw==\n-----END AGE ENCRYPTED FILE-----\n" }, { - "recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0NDB5SVcrU0V6akYwbDlv\na1BuSm5XbjYwN2ZkZWtIcnhBVHBTWGFxd24wCnZTVGlPRm5uZEd3QXYwdFRMS09K\nWWw5N2RJZ3d4N0VDMWZmM2lkYVM4VncKLS0tIGplTDVka1VoUVdXMU9VS3hYSlZ1\nRjZGL25hQWxHWEx3OXdQamJiNG9KaDgKk94uXPuCE/M4Hz/7hVKJPHuzQfbOQi/9\nVfR2i17Hjcq08l68Xzn+DllQEAFdts2fS96Pu4FFKfiLK7INl/fUOg==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age1afr59kwlpuapv2g9m0sa4k9yc22ulj7zcway538z7nnsgvf2re5qd7k03a", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6RHhiQVFKMCs2NkZ6NENl\nRzUxVWRXWmxzcGhRSXNxNjBIQ1RkN2tpN0RRCmF3QzRvQXdzSVFFcnpBOHdmRFpL\nVzBoSWZKQjJLVDRkZDdlbEVZR2ZzRTAKLS0tIHlOR1dmWEk0UTNYa05nbVR6Q2pn\nVXFDMnNxZ0xJd1ZnVWhJSVlJYmZxQUkKnWc72eUjsVpeipP76ZoiPSGockLXMR/p\nUswkQR01sCcvuPV0sJLBUK+PRMEKBjUH7O9opOvzCsTTzIVaJyLpRg==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age13ahclyps97532zt2sfta5zrfx976d3r2jmctj8d36vj9x5v5ffqq304fqf", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSVXUxNGpGYnFEdlpNNUwv\nTEo3a25sSnhHNmlZb0h0QTBwUlpjTFBtZXljCngxcUpxTEZRZlJoTHAxeFRGWXpL\nUzM0eTFOMXQzS0ZEak9NOEJzbHlGS1kKLS0tIFpkWGcwVnVIVUZEYkNlcWVMUTdE\nR21qaTgxT3BpUzVoRUlQODlyRUxodFkKYQPKrDaogCO3m9JfFHc8IrGauipcWPRF\n4P51UqhAUtWwZLdiUIoY5ucG+NaDzBxxUJqJYlUqkQMbW/OvHihu9g==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-05-29T13:15:02Z", diff --git a/clanServices/wifi/tests/vm/vars/shared/wifi.one/password/machines/second b/clanServices/wifi/tests/vm/vars/shared/wifi.one/password/machines/second new file mode 120000 index 000000000..8333cc26c --- /dev/null +++ b/clanServices/wifi/tests/vm/vars/shared/wifi.one/password/machines/second @@ -0,0 +1 @@ +../../../../../sops/machines/second \ No newline at end of file diff --git a/clanServices/wifi/tests/vm/vars/shared/wifi.one/password/secret b/clanServices/wifi/tests/vm/vars/shared/wifi.one/password/secret index 2353f2d36..543825aab 100644 --- a/clanServices/wifi/tests/vm/vars/shared/wifi.one/password/secret +++ b/clanServices/wifi/tests/vm/vars/shared/wifi.one/password/secret @@ -3,12 +3,16 @@ "sops": { "age": [ { - "recipient": "age13ahclyps97532zt2sfta5zrfx976d3r2jmctj8d36vj9x5v5ffqq304fqf", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPdkQyYnQ1UzlCWEFtdnJh\nMWlBK0RGcENTMmRITWM5SSs2Mkt2N0ZKdm5VClNTS0NuR05OVHY3QkFLZWt6bTUx\nMzJLc2Vib1ZUbW1VM0lhYXFFeEhOaEEKLS0tIHVoODVOK3BUU2JDZkJkN2I2Wm1L\nMWM0TUNQazljZS9uWXRKRFlxWmd0clUKg1YhJoRea05c24hCuZKYvqyvjuu965KD\nr4GLtyqQ6wt9sn50Rzx5cAY/Ac684DNFJVZ1RwG1NTB2kmXcVP8SJA==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBYS83dDhMV1JINWtyT3Rp\ndlRBcjIyNEZuOTBaY24zMGZYdGQwRkIzTzBFCm1VVEN5bllBbklpcDBsNzZ3V1dy\nQ3owdm5RUWlEQzI0Y21NQ1lqcjR1UWcKLS0tIFpwYlVHTUtUR0tDL1BZcWtNMUo5\nUzVwcFh3MDVZTWJCRTkzUm5pc0d6UnMKlCvwvAvS2tvZel8VrHpU1B76owilCgnV\narlc+s7i2lBIyEW5npkZGkn8RgI558C34SPRhM2+c+ennSVIYZM56g==\n-----END AGE ENCRYPTED FILE-----\n" }, { - "recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoZTA5QXpsOXR3L2FKcnJD\neUxzNVp3M2VQMFFaUUxwNXQ4UTlXa01rR0IwCjkyU2hmdlVYbWY4WUpVK0J1ZC9Q\nRjVkYWlGTlh1MFY3R3FxMEZHODZXMmcKLS0tIFV3bGdvUEtnT21wRWJveEQwdTBV\nbGFUUExBZWR1enQ0c0l0dUY3TnErM3cKutl5cv8dSlpQA7SXUYWJq1M0yLmko/Bx\nUvxxGGLQaK0Mp81Z5mOsjNhcVQrY160AyVnWJ0z39cqOJq9PpXRP+A==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age1afr59kwlpuapv2g9m0sa4k9yc22ulj7zcway538z7nnsgvf2re5qd7k03a", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvUTlBZ3NKNFVQVzdWMnFv\neHVsTStkdHJ0dmVCRFVxODhxbWZwdHlOMEZNCjUrRENVNUxDWnZJQWhKYzJUVnNK\ncXNqSWdvajlUYkdjNEVYaDdxTVZKQ0EKLS0tIFM3WWxSOGU4Yk1Wb3B3VHBtRFlj\nemFIZ0xNTnNiaSttcU1lR0xMSzVXWDQKhY4zo/aoePu1kZ1uvvu+za2vkZVNFqO0\nBYYt88gOBS7Wb2N4+54w6CIKZy7oYljY+MRwlifArFIMpCt/EF473Q==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age13ahclyps97532zt2sfta5zrfx976d3r2jmctj8d36vj9x5v5ffqq304fqf", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHalgveTJwYWEyZDRMZVB0\naVFWTnM3K1VQQzBYckVzbVVqREIxUXBsOUN3ClVRRzl5c2dqbkdTdFRUdmxtRmh0\nV1NCYURxT1d1MFdCUVRWV1hmNVh2L2MKLS0tIEdGQkFoc3FtbWQxUW43WTVwUDJr\nYlZrTmlXNVBhN3dSajlCaWxGb3JCQjAKDWYtDWKDoK6FybakbUOz1X82egHlkHte\n4noQjZ4yESGCWr9Pi3S+14IYItFObP1zh//Sab4e3uR9uVFBWLiVEw==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-05-29T13:15:02Z", From 811b994d57de65ec31d0e2a978f15f5d21b9a414 Mon Sep 17 00:00:00 2001 From: pinpox Date: Sun, 19 Oct 2025 14:54:01 +0200 Subject: [PATCH 13/19] clanServices/wireguard: fix deprecated test name - fix test name to new format --- clanServices/wireguard/tests/vm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clanServices/wireguard/tests/vm/default.nix b/clanServices/wireguard/tests/vm/default.nix index a971c4644..0ea08786e 100644 --- a/clanServices/wireguard/tests/vm/default.nix +++ b/clanServices/wireguard/tests/vm/default.nix @@ -13,7 +13,7 @@ let ]; in { - name = "service-wireguard"; + name = "wireguard"; clan = { directory = ./.; From 96fcc41b19b70128159e60c4afd28195c1c883ac Mon Sep 17 00:00:00 2001 From: pinpox Date: Sun, 19 Oct 2025 14:55:03 +0200 Subject: [PATCH 14/19] clanServices/zerotier: fix deprecated test name - fix test name to new format - regenerate vars via update-vars --- clanServices/zerotier/tests/vm/default.nix | 2 +- .../tests/vm/vars/per-machine/bam/state-version/version/value | 1 + .../tests/vm/vars/per-machine/jon/state-version/version/value | 1 + .../tests/vm/vars/per-machine/sara/state-version/version/value | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 clanServices/zerotier/tests/vm/vars/per-machine/bam/state-version/version/value create mode 100644 clanServices/zerotier/tests/vm/vars/per-machine/jon/state-version/version/value create mode 100644 clanServices/zerotier/tests/vm/vars/per-machine/sara/state-version/version/value diff --git a/clanServices/zerotier/tests/vm/default.nix b/clanServices/zerotier/tests/vm/default.nix index 9e5029896..59f555429 100644 --- a/clanServices/zerotier/tests/vm/default.nix +++ b/clanServices/zerotier/tests/vm/default.nix @@ -1,5 +1,5 @@ { - name = "service-zerotier"; + name = "zerotier"; clan = { directory = ./.; diff --git a/clanServices/zerotier/tests/vm/vars/per-machine/bam/state-version/version/value b/clanServices/zerotier/tests/vm/vars/per-machine/bam/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/zerotier/tests/vm/vars/per-machine/bam/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file diff --git a/clanServices/zerotier/tests/vm/vars/per-machine/jon/state-version/version/value b/clanServices/zerotier/tests/vm/vars/per-machine/jon/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/zerotier/tests/vm/vars/per-machine/jon/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file diff --git a/clanServices/zerotier/tests/vm/vars/per-machine/sara/state-version/version/value b/clanServices/zerotier/tests/vm/vars/per-machine/sara/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/zerotier/tests/vm/vars/per-machine/sara/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file From 4fd057413f2aa1850a4f5b25f14b69199f6c7e36 Mon Sep 17 00:00:00 2001 From: pinpox Date: Sun, 19 Oct 2025 14:58:10 +0200 Subject: [PATCH 15/19] clanServices/sshd: fix deprecated test name - fix test name to new format - regenrate vars via update-vars --- clanServices/sshd/flake-module.nix | 4 ++-- clanServices/sshd/tests/vm/no-search-domains.nix | 2 +- .../per-machine/client/state-version/version/value | 1 + .../per-machine/server/state-version/version/value | 1 + .../vars/shared/openssh-ca/id_ed25519/machines/client | 1 + .../vars/shared/openssh-ca/id_ed25519/machines/server | 1 + .../tests/vm/vars/shared/openssh-ca/id_ed25519/secret | 10 +++++++++- 7 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 clanServices/sshd/tests/vm/vars/per-machine/client/state-version/version/value create mode 100644 clanServices/sshd/tests/vm/vars/per-machine/server/state-version/version/value create mode 120000 clanServices/sshd/tests/vm/vars/shared/openssh-ca/id_ed25519/machines/client create mode 120000 clanServices/sshd/tests/vm/vars/shared/openssh-ca/id_ed25519/machines/server diff --git a/clanServices/sshd/flake-module.nix b/clanServices/sshd/flake-module.nix index 6514a8293..2db92c623 100644 --- a/clanServices/sshd/flake-module.nix +++ b/clanServices/sshd/flake-module.nix @@ -10,12 +10,12 @@ in perSystem = { ... }: { - clan.nixosTests.service-sshd = { + clan.nixosTests.sshd = { imports = [ ./tests/vm/default.nix ]; clan.modules."@clan/sshd" = module; }; - clan.nixosTests.service-sshd-no-search-domains = { + clan.nixosTests.sshd-no-search-domains = { imports = [ ./tests/vm/no-search-domains.nix ]; clan.modules."@clan/sshd" = module; diff --git a/clanServices/sshd/tests/vm/no-search-domains.nix b/clanServices/sshd/tests/vm/no-search-domains.nix index 0a98c64bf..233e3895d 100644 --- a/clanServices/sshd/tests/vm/no-search-domains.nix +++ b/clanServices/sshd/tests/vm/no-search-domains.nix @@ -11,7 +11,7 @@ ... }: { - name = "service-sshd"; + name = "sshd"; clan = { directory = ./.; diff --git a/clanServices/sshd/tests/vm/vars/per-machine/client/state-version/version/value b/clanServices/sshd/tests/vm/vars/per-machine/client/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/sshd/tests/vm/vars/per-machine/client/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file diff --git a/clanServices/sshd/tests/vm/vars/per-machine/server/state-version/version/value b/clanServices/sshd/tests/vm/vars/per-machine/server/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/sshd/tests/vm/vars/per-machine/server/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file diff --git a/clanServices/sshd/tests/vm/vars/shared/openssh-ca/id_ed25519/machines/client b/clanServices/sshd/tests/vm/vars/shared/openssh-ca/id_ed25519/machines/client new file mode 120000 index 000000000..95a74660e --- /dev/null +++ b/clanServices/sshd/tests/vm/vars/shared/openssh-ca/id_ed25519/machines/client @@ -0,0 +1 @@ +../../../../../sops/machines/client \ No newline at end of file diff --git a/clanServices/sshd/tests/vm/vars/shared/openssh-ca/id_ed25519/machines/server b/clanServices/sshd/tests/vm/vars/shared/openssh-ca/id_ed25519/machines/server new file mode 120000 index 000000000..c328f1963 --- /dev/null +++ b/clanServices/sshd/tests/vm/vars/shared/openssh-ca/id_ed25519/machines/server @@ -0,0 +1 @@ +../../../../../sops/machines/server \ No newline at end of file diff --git a/clanServices/sshd/tests/vm/vars/shared/openssh-ca/id_ed25519/secret b/clanServices/sshd/tests/vm/vars/shared/openssh-ca/id_ed25519/secret index 0634f39ef..fa6963dae 100644 --- a/clanServices/sshd/tests/vm/vars/shared/openssh-ca/id_ed25519/secret +++ b/clanServices/sshd/tests/vm/vars/shared/openssh-ca/id_ed25519/secret @@ -2,9 +2,17 @@ "data": "ENC[AES256_GCM,data:Qje3bXRHcAiFCslFfAeUTcOn2woc06e1sLAoH16x1sZ7N0i07rHqwsBjn7nKvMee6tktIjLMGTPOQL9TLgYI+wDgU5MHqlZlVBnYLk+VXYEKhymDlS3RAg5pbrmJzkucl/Vw5VBlDK+n8qnrgFG2pgpiC6Lzb5f4I7pxUl4zcz9jCf0Stj10lVQgkbvnr8UMUvcb1vUF/EAhF6WhhhgrhpbYrK+PkNW6EXmxIXdUdXvSqVWvJby2NgBaGOM1lwnWv4LOOiJ1BNXnOnLE0a8+8SjqahzqroeFvUCtoFxJ45/LqFTtgS9cQ44FaqrMRSWlOgsNR2BkeT449fKUCwYfEW1g/R47I9hAm/bcKrOBpHdAji/hpcDy73Qb9ZKrY6/0kRXl/ECI3YVX8nrHIjEJpoZ7a/dxJu7z8OOdb7gP2mVPTiWcbpD/KwpefDWLKnYhBrXUNaqSajf95Ahln2Vn6sALbbjcUzs/x5OqchYe1/kYy7MaGbEFNPeINnGid73c7xfUoyI90Ho4azLW8Q/n,iv:9heXX8g1P8/4gGT3+RYYmz6rJ5EnIDr5w1OAbGybL+I=,tag:p6mHZ8+EaJ+Nyn59n2TQ4g==,type:str]", "sops": { "age": [ + { + "recipient": "age124l8cfswl97ck0e0qw8l47usf375srn69e4mhxr3gr40erxw7pesftxshx", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5b0Y3aldQWXJyZzU3aGZU\naWpOK1VXdUVlSUVvZzJqSDVCekQ0Z2JxblRvCmFWd0c1SC9jckMweTIrNmg0VnN3\ncTNwMkVTL0ZyT3RGeUs2NnlNb21GWTQKLS0tIEpGM2FacUNoakJ0dlJwMWZMNU0x\nVWhmV1pDOTRFNExpVHBTRUx2L2ZaMVUK+ka9oqcvoLjwwUqIol0rU1VsJHhs4S1P\nWpKKPetUPEF4xxWj0OdeMc40XCTjl6CBdbtcrslH3tuZHjeSWQ6QCg==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkNlpCNGR0SHVtVzJ2K0hM\ncng1ZWlTSGQzWndXVWhlbEZMN25TUklXV1I4Cm9PZkJ3Zi81YXoxdzVPTFI3dE1a\nUnJnUmJPbi9CYmdFL2ltaTRSQ1MreFUKLS0tIDE4Y05IamJjL0huY2l2YU4zbDJs\ndTl1b0wzaTM4MndlcFZYVThqbWtVeFUKuSZLJpUrccuusJPU2xWHw19wTN8mKZW3\n1GJJjlb79rZp/RbSMxFxkyVHgu+F9kbpRgViICJSWkeR495786oArA==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLM3lNL1UyUjhRdFBvenlv\naXBTYXJva0hCTS8vK1hCYmdQdlpBNGFNTkNrCmVTbFROTWVWRzZyc2E0SjVDT1hs\nMm9qT0plcHNJaWczcWJTd0llYldGMVkKLS0tIGh6M04yQ3RiMGVYbTNYMEdCVTNK\nUDhaS3FSVWl4ZGlPYTRodW80VElsZ1UKxi48UZpxuu7gkRtQrCi4//suOpuFY6sl\n8b1xcN/tMn2MWW9hvx4K4qJLXTWOm+9GiZqJ51JBb0hihRh7fC3SfA==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1f39qxz84yv272wk636el0kdyagzudcs99ucpkjarsj2rey6yvccse9lwet", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGK2Z5OGFsVjBJcGFITENH\nL205TDBaNkRvQ3ZBbGVDU0wrWnl5QkJaSFZNCjhNSXpMTTd1ejlqbVNBUDZ2TlFn\neUhNdEh4M1RhQnFabHpaMVd5eG11THcKLS0tIE9PS3JlVFVPNG5sM3hpWG95V1ho\nSXBySU1SUExkVHNHZElmQWExTVN3cHMKvzdlCWP8/9xviu/9AMxw/4ZyXo4O3AE9\n84IQBDO4GYrqnXvOroxjsNCDrCBDH0WPuYAphctJvyI5SSAtL4uHhQ==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-06-09T19:51:28Z", From e0b58550133ea9c294488917166a6aedfacd41cd Mon Sep 17 00:00:00 2001 From: pinpox Date: Sun, 19 Oct 2025 15:00:00 +0200 Subject: [PATCH 16/19] clanServices/trusted-nix-caches: fix deprecated test name - fix test name to new format - regenerate vars via update-vars --- clanServices/trusted-nix-caches/tests/vm/default.nix | 2 +- .../vm/vars/per-machine/server/state-version/version/value | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 clanServices/trusted-nix-caches/tests/vm/vars/per-machine/server/state-version/version/value diff --git a/clanServices/trusted-nix-caches/tests/vm/default.nix b/clanServices/trusted-nix-caches/tests/vm/default.nix index b255d7824..5d0a21b91 100644 --- a/clanServices/trusted-nix-caches/tests/vm/default.nix +++ b/clanServices/trusted-nix-caches/tests/vm/default.nix @@ -1,5 +1,5 @@ { - name = "service-trusted-nix-caches"; + name = "trusted-nix-caches"; clan = { directory = ./.; diff --git a/clanServices/trusted-nix-caches/tests/vm/vars/per-machine/server/state-version/version/value b/clanServices/trusted-nix-caches/tests/vm/vars/per-machine/server/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/trusted-nix-caches/tests/vm/vars/per-machine/server/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file From ac1cd5114ac75b9c6e6f00fb979891cb029491fb Mon Sep 17 00:00:00 2001 From: pinpox Date: Sun, 19 Oct 2025 15:07:25 +0200 Subject: [PATCH 17/19] clanServices/admin: fix deprecated test name - fix test name to new format - regenerate vars via update-vars --- clanServices/admin/tests/vm/default.nix | 2 +- .../vm/vars/per-machine/client/state-version/version/value | 1 + .../vm/vars/per-machine/server/state-version/version/value | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 clanServices/admin/tests/vm/vars/per-machine/client/state-version/version/value create mode 100644 clanServices/admin/tests/vm/vars/per-machine/server/state-version/version/value diff --git a/clanServices/admin/tests/vm/default.nix b/clanServices/admin/tests/vm/default.nix index 90bfd6605..188adb309 100644 --- a/clanServices/admin/tests/vm/default.nix +++ b/clanServices/admin/tests/vm/default.nix @@ -2,7 +2,7 @@ let public-key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII6zj7ubTg6z/aDwRNwvM/WlQdUocMprQ8E92NWxl6t+ test@test"; in { - name = "service-admin"; + name = "admin"; clan = { directory = ./.; diff --git a/clanServices/admin/tests/vm/vars/per-machine/client/state-version/version/value b/clanServices/admin/tests/vm/vars/per-machine/client/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/admin/tests/vm/vars/per-machine/client/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file diff --git a/clanServices/admin/tests/vm/vars/per-machine/server/state-version/version/value b/clanServices/admin/tests/vm/vars/per-machine/server/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/admin/tests/vm/vars/per-machine/server/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file From 62d3a18783fe74bbc166d216b88b4922f28568b6 Mon Sep 17 00:00:00 2001 From: pinpox Date: Sun, 19 Oct 2025 15:09:42 +0200 Subject: [PATCH 18/19] clanServices/wireguard: fix deprecated test name - fix test name to new format - regenerate vars via update-vars --- clanServices/wireguard/flake-module.nix | 2 +- .../vm/vars/per-machine/controller1/state-version/version/value | 1 + .../vm/vars/per-machine/controller2/state-version/version/value | 1 + .../tests/vm/vars/per-machine/peer1/state-version/version/value | 1 + .../tests/vm/vars/per-machine/peer2/state-version/version/value | 1 + .../tests/vm/vars/per-machine/peer3/state-version/version/value | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 clanServices/wireguard/tests/vm/vars/per-machine/controller1/state-version/version/value create mode 100644 clanServices/wireguard/tests/vm/vars/per-machine/controller2/state-version/version/value create mode 100644 clanServices/wireguard/tests/vm/vars/per-machine/peer1/state-version/version/value create mode 100644 clanServices/wireguard/tests/vm/vars/per-machine/peer2/state-version/version/value create mode 100644 clanServices/wireguard/tests/vm/vars/per-machine/peer3/state-version/version/value diff --git a/clanServices/wireguard/flake-module.nix b/clanServices/wireguard/flake-module.nix index 12d4ee6df..bd639e4c9 100644 --- a/clanServices/wireguard/flake-module.nix +++ b/clanServices/wireguard/flake-module.nix @@ -7,7 +7,7 @@ in perSystem = { ... }: { - clan.nixosTests.service-wireguard = { + clan.nixosTests.wireguard = { imports = [ ./tests/vm/default.nix ]; clan.modules."@clan/wireguard" = module; }; diff --git a/clanServices/wireguard/tests/vm/vars/per-machine/controller1/state-version/version/value b/clanServices/wireguard/tests/vm/vars/per-machine/controller1/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/wireguard/tests/vm/vars/per-machine/controller1/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file diff --git a/clanServices/wireguard/tests/vm/vars/per-machine/controller2/state-version/version/value b/clanServices/wireguard/tests/vm/vars/per-machine/controller2/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/wireguard/tests/vm/vars/per-machine/controller2/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file diff --git a/clanServices/wireguard/tests/vm/vars/per-machine/peer1/state-version/version/value b/clanServices/wireguard/tests/vm/vars/per-machine/peer1/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/wireguard/tests/vm/vars/per-machine/peer1/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file diff --git a/clanServices/wireguard/tests/vm/vars/per-machine/peer2/state-version/version/value b/clanServices/wireguard/tests/vm/vars/per-machine/peer2/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/wireguard/tests/vm/vars/per-machine/peer2/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file diff --git a/clanServices/wireguard/tests/vm/vars/per-machine/peer3/state-version/version/value b/clanServices/wireguard/tests/vm/vars/per-machine/peer3/state-version/version/value new file mode 100644 index 000000000..115ab7a6a --- /dev/null +++ b/clanServices/wireguard/tests/vm/vars/per-machine/peer3/state-version/version/value @@ -0,0 +1 @@ +25.11 \ No newline at end of file From 893fa47a5018703b1b8f8a4bb2bfa0315f514c62 Mon Sep 17 00:00:00 2001 From: pinpox Date: Sun, 19 Oct 2025 15:17:41 +0200 Subject: [PATCH 19/19] Run treefmt --- clanServices/dyndns/tests/vm/sops/machines/server/key.json | 2 +- clanServices/wifi/tests/vm/sops/machines/second/key.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clanServices/dyndns/tests/vm/sops/machines/server/key.json b/clanServices/dyndns/tests/vm/sops/machines/server/key.json index 41786e32c..4d3d00d2b 100755 --- a/clanServices/dyndns/tests/vm/sops/machines/server/key.json +++ b/clanServices/dyndns/tests/vm/sops/machines/server/key.json @@ -3,4 +3,4 @@ "publickey": "age164wrhlnake7f7duhzs936lq6w49dtg53hcdyxqwxj0agad6tqg2s2u4yta", "type": "age" } -] \ No newline at end of file +] diff --git a/clanServices/wifi/tests/vm/sops/machines/second/key.json b/clanServices/wifi/tests/vm/sops/machines/second/key.json index 822a69d96..df6fbd3ad 100755 --- a/clanServices/wifi/tests/vm/sops/machines/second/key.json +++ b/clanServices/wifi/tests/vm/sops/machines/second/key.json @@ -3,4 +3,4 @@ "publickey": "age1afr59kwlpuapv2g9m0sa4k9yc22ulj7zcway538z7nnsgvf2re5qd7k03a", "type": "age" } -] \ No newline at end of file +]