From 90a92f23bd0d1fb7fd63224222c85785c74d787b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 1 Jul 2026 08:00:37 +0200 Subject: [PATCH 1/2] tribuchet,nixbot: bump --- flake.lock | 16 ++++++++-------- flake.nix | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 02f0f6aa1..8889d97ec 100644 --- a/flake.lock +++ b/flake.lock @@ -737,16 +737,16 @@ ] }, "locked": { - "lastModified": 1782808478, - "narHash": "sha256-aSeIbszt/9Dt2qPZ336JKcJFB6QFMRCUwJhUo9Puw3M=", - "ref": "run-history", - "rev": "de31124028fe72052c8be9c180b091c111d4d030", + "lastModified": 1782885506, + "narHash": "sha256-N7rhZNCfBwXXdNdXihSqYM2ra+6pH5q5H1Tm3y0iEb8=", + "ref": "restart-rights", + "rev": "8097eaa7a8d79da6dbd0ac77c94d1568e44cb1c6", "shallow": true, "type": "git", "url": "https://github.com/Mic92/nixbot" }, "original": { - "ref": "run-history", + "ref": "restart-rights", "shallow": true, "type": "git", "url": "https://github.com/Mic92/nixbot" @@ -1065,11 +1065,11 @@ ] }, "locked": { - "lastModified": 1782856656, - "narHash": "sha256-dedl4w2MnZJxJV8LpdJeRPi2ueCMIqxTgTlGvgqn4Gc=", + "lastModified": 1782859168, + "narHash": "sha256-mOuVjCKdHssvl17s4CKCk9SBJQUsWJ15xFDWAgo3i0c=", "owner": "Mic92", "repo": "tribuchet", - "rev": "abcea59743596594ad9ac50a4708ca3c25240588", + "rev": "c2cbc22385f1e1d25e7092bedf3df0fdd92cad9b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e7013ef32..de3f64175 100644 --- a/flake.nix +++ b/flake.nix @@ -83,7 +83,7 @@ data-mesher.inputs.treefmt-nix.follows = "treefmt-nix"; data-mesher.inputs.flake-parts.follows = "flake-parts"; - nixbot.url = "git+https://github.com/Mic92/nixbot?shallow=1&ref=run-history"; + nixbot.url = "git+https://github.com/Mic92/nixbot?shallow=1&ref=restart-rights"; nixbot.inputs.nixpkgs.follows = "nixpkgs"; nixbot.inputs.treefmt-nix.follows = "treefmt-nix"; From 020c2e2b043b7c84f3a14eeb7025e98b21f7a9e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 1 Jul 2026 08:09:10 +0200 Subject: [PATCH 2/2] Remove nncp nncp-based nixos-rebuild distribution no longer used. --- machines/eva/configuration.nix | 1 - machines/eve/configuration.nix | 1 - machines/turingmachine/configuration.nix | 1 - nixosModules/nncp.nix | 151 ------------------ sops/secrets/eva-nncp/groups/admins | 1 - sops/secrets/eva-nncp/machines/eva | 1 - sops/secrets/eva-nncp/secret | 28 ---- sops/secrets/eve-nncp/groups/admins | 1 - sops/secrets/eve-nncp/machines/eve | 1 - sops/secrets/eve-nncp/secret | 28 ---- sops/secrets/turingmachine-nncp/groups/admins | 1 - .../turingmachine-nncp/machines/turingmachine | 1 - sops/secrets/turingmachine-nncp/secret | 28 ---- 13 files changed, 244 deletions(-) delete mode 100644 nixosModules/nncp.nix delete mode 120000 sops/secrets/eva-nncp/groups/admins delete mode 120000 sops/secrets/eva-nncp/machines/eva delete mode 100644 sops/secrets/eva-nncp/secret delete mode 120000 sops/secrets/eve-nncp/groups/admins delete mode 120000 sops/secrets/eve-nncp/machines/eve delete mode 100644 sops/secrets/eve-nncp/secret delete mode 120000 sops/secrets/turingmachine-nncp/groups/admins delete mode 120000 sops/secrets/turingmachine-nncp/machines/turingmachine delete mode 100644 sops/secrets/turingmachine-nncp/secret diff --git a/machines/eva/configuration.nix b/machines/eva/configuration.nix index 7e0d57ad9..457b6340a 100644 --- a/machines/eva/configuration.nix +++ b/machines/eva/configuration.nix @@ -28,7 +28,6 @@ ./modules/telegraf ./modules/zerotier.nix - ../../nixosModules/nncp.nix ../../nixosModules/iperf.nix ../../nixosModules/radicle-mic92.nix ../../nixosModules/openldap/replica.nix diff --git a/machines/eve/configuration.nix b/machines/eve/configuration.nix index 0e44dff2d..7b717947c 100644 --- a/machines/eve/configuration.nix +++ b/machines/eve/configuration.nix @@ -86,7 +86,6 @@ ../../nixosModules/builder.nix ../../nixosModules/docker-zfs.nix ../../nixosModules/iperf.nix - ../../nixosModules/nncp.nix ../../nixosModules/openldap ../../nixosModules/fluent-bit.nix ../../nixosModules/rtorrent.nix diff --git a/machines/turingmachine/configuration.nix b/machines/turingmachine/configuration.nix index 29fa2e079..f248db5e5 100644 --- a/machines/turingmachine/configuration.nix +++ b/machines/turingmachine/configuration.nix @@ -38,7 +38,6 @@ ../../nixosModules/ksmbd.nix #../../nixosModules/lanzaboote.nix ../../nixosModules/make-linux-fast.nix - ../../nixosModules/nncp.nix ../../nixosModules/no-hz.nix ../../nixosModules/sshd/tor.nix ../../nixosModules/suspend-on-low-power.nix diff --git a/nixosModules/nncp.nix b/nixosModules/nncp.nix deleted file mode 100644 index e5960130e..000000000 --- a/nixosModules/nncp.nix +++ /dev/null @@ -1,151 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - nodes = { - eve = { - id = "32BJZQY3HYDKL4F2FT3WRQGQRSNOEOLJRSLXBPEX7MDTCSWOJCJQ"; - exchpub = "4F2ZK4KXGBANDBL4XEO4CFDNNBKYPJCWKVTXFG6KIKBSVTTYKIPQ"; - signpub = "TZXAPW4IPVMKU2K23ZYCW6BDUZWMLCP6UDSQCZXLP3DHEEMNOD3Q"; - noisepub = "5UYKFAKYU7RG5CLN57WJUVXG3T7PC5KXACOHVDNUIIS33BFAUBTQ"; - addrs.internet = "eve.i:5400"; - }; - eva = { - id = "YHZBK6LYPM6L6YBWZJRLSRMIEHI4ZM5WYYIKFDO2RR3BESULXT4Q"; - exchpub = "QDSEQD7ZIIU7L2YR37ZKOATG7GT6BC6VK2XKI2FS4HJJORUU4UVQ"; - signpub = "7HNVCSILQB2QIHPAWM2WQQFXA6STFGJZZT7DX6JZYQ3B3TGT63AQ"; - noisepub = "IBH6IIRZHC6E6WDKVG26CR3XY3YDRYBRVDKXYY6E3JHJWMDANB4Q"; - addrs.internet = "eva.i:5400"; - }; - turingmachine = { - id = "5QX2ZVPHKAGCSETCTX5V5JFY6P7ZAPJ55CC3CVINQYD7WJBHVHYQ"; - exchpub = "LRHUBHPRIWEFUUVXXWANSPDVGCYCHY7F4YQ4XGFTHQUVYK7ZJEMQ"; - signpub = "JRWYU3LMGOUBPA4GFJQT4CJNFS67UENBN7BMMVVDH6RERGSXUT5Q"; - noisepub = "6IKRB2ICMURMGJLVVHCUZY5UCGG7ERRO55MYDAX4X5VXH7LDPB2Q"; - }; - }; - nodesJson = builtins.toFile "nodes.json" (builtins.toJSON nodes); -in -{ - networking.firewall.allowedTCPPorts = [ 5400 ]; - services.nncp.daemon = { - enable = true; - extraArgs = [ - "-autotoss" - "-autotoss-gen-ack" - ]; - socketActivation.enable = true; - }; - environment.systemPackages = [ - (pkgs.writeScriptBin "nncp-nix-update" '' - #!${pkgs.bash}/bin/bash - set -euo pipefail -x - export PATH=${ - lib.makeBinPath [ - pkgs.coreutils - pkgs.nncp - config.nix.package - pkgs.jq - pkgs.gnutar - pkgs.zstd - pkgs.gitMinimal - ] - } - if [[ $# -lt 1 ]]; then - echo "Usage: $0 " - exit 1 - fi - if [[ $(id -u) -ne 0 ]]; then - echo "Must be run as root" - exit 1 - fi - path=$(nix flake metadata --json | jq -r '.path') - node=$1 - shift - tar -C "$path" --zstd -cf - . | nncp-exec "$node" nixos-rebuild "$@" - nncp-call "$node" - '') - ]; - programs.nncp = { - enable = true; - secrets = [ config.sops.secrets."${config.clan.core.settings.machine.name}-nncp".path ]; - settings.neigh = lib.mapAttrs ( - name: node: - node - // { - exec = { - "nixos-rebuild" = [ - (pkgs.writeShellScript "nixos-rebuild" '' - export PATH=${ - lib.makeBinPath [ - pkgs.nncp - pkgs.gnutar - pkgs.zstd - ] - } - set -euo pipefail -x - (if [[ "$NNCP_SENDER" == "${nodes.turingmachine.id}" ]]; then - if ! tar -C /etc/nixos --zstd -x -f -; then - echo "failed to extract tarball" - fi - if ! /run/current-system/sw/bin/nixos-rebuild switch 2>&1; then - echo "failed to switch, see above" - fi - else - echo "sender $NNCP_SENDER does not match turingmachine. Do not run update!" - fi) | nncp-exec "$NNCP_SENDER" "nixos-rebuild-notify" - '') - ]; - "nixos-rebuild-notify" = [ - (pkgs.writeScript "nixos-rebuild-notify.py" '' - #!${pkgs.python3}/bin/python - import json - import os - import subprocess - from pathlib import Path - - def main() -> None: - sender = os.environ["NNCP_SENDER"] - - try: - message = input() - except EOFError: - message = "no message" - - sender = f"unknown machine ({sender})" - nodes = json.loads(Path("${nodesJson}").read_text()) - for name, data in nodes.items(): - if data["id"] == sender: - sender = name - break - else: - print(data["id"], sender) - env = os.environ.copy() - env["XDG_RUNTIME_DIR"] = f"/run/user/${builtins.toString config.users.users.joerg.uid}" - env["DISPLAY"] = ":0" - env["PATH"] = "${ - lib.makeBinPath [ - pkgs.libnotify - pkgs.dbus - pkgs.util-linux - ] - }" - subprocess.run(["runuser", "-u", "joerg", "notify-send", f"nixos-rebuild from {sender}"], env=env) - with open("/tmp/nixos-rebuild.log", "w") as f: - f.write(f"nixos-rebuild from {sender}:\n") - f.write(message) - if message[-1] != "\n": - f.write("\n") - if __name__ == "__main__": - main() - '') - ]; - }; - addrs.tinc = "${name}.r:5400"; - } - ) (nodes // { self = nodes.${config.networking.hostName}; }); - }; -} diff --git a/sops/secrets/eva-nncp/groups/admins b/sops/secrets/eva-nncp/groups/admins deleted file mode 120000 index e5092e314..000000000 --- a/sops/secrets/eva-nncp/groups/admins +++ /dev/null @@ -1 +0,0 @@ -../../../groups/admins \ No newline at end of file diff --git a/sops/secrets/eva-nncp/machines/eva b/sops/secrets/eva-nncp/machines/eva deleted file mode 120000 index 4255cef1b..000000000 --- a/sops/secrets/eva-nncp/machines/eva +++ /dev/null @@ -1 +0,0 @@ -../../../machines/eva \ No newline at end of file diff --git a/sops/secrets/eva-nncp/secret b/sops/secrets/eva-nncp/secret deleted file mode 100644 index c58de41ad..000000000 --- a/sops/secrets/eva-nncp/secret +++ /dev/null @@ -1,28 +0,0 @@ -{ - "data": "ENC[AES256_GCM,data:q2jiv+QcN48TmKoTec3WxdDv6EmvKcFxqvqqo+8okAWcSaDoogFB6ciQosGfCnuRhjJ1vEslkc2ljJODfiEW3MKBFAZkpN6XJzzfsa9Ks4nuf434OyIZ4nr2O9CAgQY+WfOLmnC+/QdPVOlDhisj7y1a3fmqnYF57ms4ervXBzsxNpMPmx4pB/pFTVC7U41sTYKXU5YH/8eW4A1JpgpcaGxSsXJ+1EqH62/t40rH5Qe0lky2KiaXprg1KxHchcEpo1Mq/+VGYm1dkkwEIzaJFSUngD1IL59dVKApVoCiHLNvuJS68h2FHO++OkJ2gm7EIKcTWLtrLahSezNcnPD+BPb/tCcav38Yl4VtVXKmVP3gzzblo+KzBbD6ABKknOvJ7lzbJJ/HnethYXkhmGSOwkozTxwIQ6a9dt0u6bonBcon6x7u0kYmmOPGDajz3SULv6IZlL6SNEbwSTnGfdTbaEMN/9imQZEptCVIifUM2PlH43UTX1z73UWVyo7fedefnu4Y03RhjbEYzwYd98lR2DWE5YaDNfUn43ZV+mMmyjUEhQvH7FWQxqtghULXHVwBtVPb5iSodduIqnb/+4G7bO6tMXEAqb9IL7DY+8NokrabEZSF5389x5aMsHHjZJ1t6aecCOPK0lZk0DNpZvmCYjdub9jrqE40r0pU90FDeAS/LRYiXGm0ILsJMH85QrnYl/QDJRqnyfyNriY10LgHdF0LajALNqFfkYg4MMEkoejrojFZNRapJQTacewca/yYNIN9UGYatGPlRX97Hsu28lJPYR94YdZR6aUAfPGKtCGP9fqIb5eeHwlv3uk+p+fQaN2L6E2j02esnCUjnN+udA/kTSfG9KJsd+FHu103lLZrkF9NmioxT1EuJwnjltdPmQnmsZHkN/Ty9Js1enwoO3hF8aNdnXo4fPtw2BuYELlNGnO2TN8lqTT4yMEjlzmfL7o6eaRUTytCthg7HAbAv7spU4MwQ4nIGtPqhmpMMfARvIV2a6cY/wVuWFAVCcEposLLuFMhjDNecGLD2iFwKBqGNX9mzHAm8dFDK4WZnOJntK2RWW9ygi1pD5/t1paHNcC5OBWos4YiBCIcXmf7iKTHdQbQszvwrrkfXiPP92DGXyq39Ar+E1nVapvkeN65LNXE2OfRSEcKSSorwMb00tGXiflzfXIV8L4FALLERnAz+XMczpETvKnY+9TcZ7Es+WytDmF2+ur7ObPKiH3EmvdLs+NRIgaTSVEw54R1gTQqQuLtqow3ceVnivVwg/7ujPWjzqV0rpXUTPaZgg0WgZf9M14qZUjg4JL2+n9zEBkuGRqjb2f14OWcayUwZaAaS4gPwEmgYTP5qNZQzEjs5jkbSqVGIRKPYOrIyqGEv/vYnL0+csi7WdiKykdshqIZI/OY1HaLedqlZHkd5xetxfmcjR0Y8309NqDG4podxwWdnWax5nNPT1R82tb3Brs1YXjc56APLcu0/wPhUPkbSUPmb2eDNzqqnvs8RsLnztTw3UxgdxNvDbMy4cKCzQYwF4jXFIfrnOrb,iv:XmYDM0/KzK6I2gKbNwaBDfr7t7A81xnc0kXagPz/Co8=,tag:t8chZMSnNVYCXb8CmDEqpg==,type:str]", - "sops": { - "kms": null, - "gcp_kms": null, - "azure_kv": null, - "hc_vault": null, - "age": [ - { - "recipient": "age1mvtwyahfw7cc7lj8767v046zcw2kxdzsnw2cymj0alycrmaf5vhqugfx8x", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlYTJ6K01TMElJU2U2MDhZ\nN2lUd05RRGZ2cGNOcThIUEw0U2lZVFh0aHl3Ckd5NXA2RWVlQlY2ZVNobDVBT21C\nVCtQMzlWemVST1ZHcCtXZ1JqZ3F4RzAKLS0tIENRTmJjQjROazRNOW01bXgra294\naFRFajhrMGRUZ0dzN1ZUQ1M3QVY1RnMKiJ/J32LezK79MMlrHlugf47MgdX1ZZYq\noijSlzmgdobNSWhLr5sdhC7du7PtLsk2ScXmz2HQdaxAKMNF4LS6UA==\n-----END AGE ENCRYPTED FILE-----\n" - }, - { - "recipient": "age17n64ahe3wesh8l8lj0zylf4nljdmqn28hvqns2g7hgm9mdkhlsvsjuvkxz", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWc1l6Qk9lSUdNczNmelB2\nVGxkcVQxaDZXTnoxWHl3U0c5b3BxSjJtcUFBCkZJWm5MbWdQM1g4Qnk0UVZrSWVi\nZFl4U3cvM3J4K0RYa2g0R081eVpkakEKLS0tIGJUSG9vSTZrTzc4ZXFJWnd1Wnh5\nazVkQWcydEhYT2xnYmFYTzBpNUVGMUkKBJkb++jA/m2bYhjltf7uMjNB7xmC2HvQ\nmGsGFRrl7wD3aPBCkVzgx2bhJ7o3Du1xXDzBhyw5tsrU0tMPh/EAVQ==\n-----END AGE ENCRYPTED FILE-----\n" - }, - { - "recipient": "age1nnm255ah9wa4gpsaq0v023a75lnmlcxszt9lc6az3mtwzxgrucfq45rp7h", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsWi9OTTBUNDFzMW8zMlJu\nVmxyeGF0dEhzSXdFZTlWU283bk5mZEF3UkJvCncybkFmVjN3ekI0T1licGZsMjFt\nZmJyejRyY3hoVnduYWphd1VyWDQrSXMKLS0tIDgwcEptRUdTeGpobmkreWNkUnJv\nLzN2Y2V0SmE2ZEhiVWtMUlp6QjQxNXcKXAY6c56jz+bK5NWa/dQMmovDyGpt9iOK\nIY16l9sp7Hj8UePJzRs17luGUROucXaL32p6K/pA33tkmRYB9V44Lg==\n-----END AGE ENCRYPTED FILE-----\n" - } - ], - "lastmodified": "2023-09-03T06:48:05Z", - "mac": "ENC[AES256_GCM,data:bUV/RFfmXdYfJKE47hjz7ALqafXwvlMINNAwG0Ft6cgQlWYa8+jB+XEntR38jBfTTEZaI1UlHJ6TPlJ0GCSR4bEe1GEAgVcd2NXDRwoA95WGDlfQ5wD6KSbFzcxkbmq7zdtl9rFh+2u9HiV6lpDrNZbDGrMn9joRf4sAxQBGXz0=,iv:iMzVcTtHSxl8s7dF9xgfMHvW7yGUibmxi8aDxVbeomY=,tag:5mYRfxng+NE5PqL1TDjDQQ==,type:str]", - "pgp": null, - "unencrypted_suffix": "_unencrypted", - "version": "3.7.3" - } -} \ No newline at end of file diff --git a/sops/secrets/eve-nncp/groups/admins b/sops/secrets/eve-nncp/groups/admins deleted file mode 120000 index e5092e314..000000000 --- a/sops/secrets/eve-nncp/groups/admins +++ /dev/null @@ -1 +0,0 @@ -../../../groups/admins \ No newline at end of file diff --git a/sops/secrets/eve-nncp/machines/eve b/sops/secrets/eve-nncp/machines/eve deleted file mode 120000 index 1ef92aca2..000000000 --- a/sops/secrets/eve-nncp/machines/eve +++ /dev/null @@ -1 +0,0 @@ -../../../machines/eve \ No newline at end of file diff --git a/sops/secrets/eve-nncp/secret b/sops/secrets/eve-nncp/secret deleted file mode 100644 index b4afc7437..000000000 --- a/sops/secrets/eve-nncp/secret +++ /dev/null @@ -1,28 +0,0 @@ -{ - "data": "ENC[AES256_GCM,data:Ov8R8vmfQ/HiUkG38hJl1tM5LYRZKIQCv3HlYBIPjEfJPeBDCimMchvHWZyzeS+ZiFVh9RmUjx82Cj0RPIcN+ysu8JpNrKLzxSnmxgCBmZxmDpdh0W7Vr4Uu6u6g4u+MzxjbFX9EV1bnMr1Fat1FpmJn0yst8IPohacWBzfWxujO/xO8L0r/qUs3tXjmnc3aCC3xFs1U1jVUmA/n6pcFxTawgrjf/osBkAnmUXc0213Rf+/NzAKJPmwL1zEpRPIAyc87GTSi7BZ0FRgO+bFmS90fCthZaNEj8sN57OthOt4aPDZmnjQJc3gmqaMFhIJt+te9wZXqVyN6vN1nRXAiWgTozXVQxkyvY9bq/hq/kPPMtr6LEgYAS5WPcsjw11HHoLFfxaon8+RgqIaFpYzf3tLVFJiQwO3jHie7/uMnCb9q60GriFsZ0d80wxiBr/1D4ItMr/oZwrEu0o2BQ8nO/MCNROYE133rpJpUPdN54c1QiXp5qWo0vXWGtPjNPSNhGdbs9j5SH3Oj5GK9u9yRWnS4VsKYR9G+02jcz2Sfnl/ZE4yXWy8JJkEUMg7zAjIeN3LC6YjKkxm36+Uje18UP7DaM0/z4avkxhVf74Y3ndDhKxQFUUuAvBQWAjYYzFHmGnhuxNcPfckkZJi1jE1Fth91wGJb+mdpnCV89nAK+na3FYAZGca1RVr/aShaHTxBP5q32GDH7Q9LSsqNei8a9rR+zNuMt6Ys/O87cH/uvuSfrDKq22d4oUhjLgFV/yTPQzOruwVKU6GeKDYk9Quqep7PxHhuAFxLfVvTOyaR5Xq8CfHEQuThC0d2jh6FrPVUzWWVtApPNDE4JhbtAJC1RE954vET452UUQ0xa68s7YZNMhIM5rJN/K71P9pYjHhgHQ0nSeeMgpEJHa8+ruJBM4n7NqG947cXwhhCCUaS88vx8qmEUBvvfWGi5R4wh/JATfD0I48/CpCkqvyZblO3ez56PpWy5IsT+Kb70dAPq04mMlncWamIjJc1MfjK/6J0ZfExv6rAHQm0xMFA9mgMxdI5m0y7spTTErVaJxm81h2VESba70TYLl/rGvZCToGkAUbIXEvIEzBvKAvk8jtNheTia+1QmjrT+AHX2u1JmRvMkRxH8EVN98XCHL4ppeO/UdrgTwrT2QmyJU/zJU02sCosrOvdtIHjkEU0GWuH3+LrL6b19a/K3HNfgwPAzbEfSisGznxtHxIXKTYf6UkVGKuxs5DDH4oFdhzW15ZkHpbCMnTz35MjE50xwj3b6TurWmCFCiLHz6zWhVJLnoKfQJMs9/iIB5OC2DGq8H9p2x/aFu0AxyZgyjNxBd66Wb0338Cc7MiazWsTqJebGkYlA6o3o0E0huOYyZIZkdZSfbEfIxFDiDD1ejuPCr4MuYrMWcPsRAf2tbsJ8F//3wpxKIkQwepfa8MCZkw1XUY7AMRG9Mq2+BoXysrF0AKGLHAsAcSxy/Iptc2SrGAmBVY/oVbWD8GshO62pZX5qKUPlwQ+8p86NPYC5qxKD8l/RNqlgoJeKD3xJTb3S7gV/y7FKRKpERcpZ36A1UlZoDHtDQJwbqSaJL0jxP9dsmZzpmOinwpgHZrk+anHhXBXwLSURznMmw44zLkcLJUNRkqKWHT5INSkNAEo/PLUBgumd4PCc/mdOODGOOq6GQwfx4AeBzfNSgQJPOyR9typxd/147PkJ64qqQd2CQ6jWUrl0XK081+8cjzGZW70TkzRPrPGZQt730qYbeZX5YnF2VfHzQAQCMFMvDvtEO0=,iv:5sFjqfbINOMB2qhEX5yi2YZXPDgZGs2R1Mco+8WTdD0=,tag:74g4WlctpMVUXnp4sSWcYQ==,type:str]", - "sops": { - "kms": null, - "gcp_kms": null, - "azure_kv": null, - "hc_vault": null, - "age": [ - { - "recipient": "age1hjm3aujg9e79f5yth8a2cejzdjg5n9vnu96l05p70uvfpeltnpms7yy3pp", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3azFKL1ZlQWFEdUVXb0tJ\nbXBwaXAyQUY1T3V6VkovU0lTb09LNWdTcTBRCk1DTEN5ZlZpMUxUc1JKWWR6S2Ux\nR09aM045SkJjeTdSTFV5SkVhYkNxazAKLS0tIGxhRFU2TWl2NzR0K2VWNitxTC85\nd1d2TlZOaERnSDFUTWQzYzZFZWczbUUK+Zwaiw3qNGy4pxYMpA1+n8uPJxcw1gab\noISbe8+uGwUjutnV8xt2MC4BWWiLRYv/NP+tOcXBdW0TZtGIWMtp0g==\n-----END AGE ENCRYPTED FILE-----\n" - }, - { - "recipient": "age17n64ahe3wesh8l8lj0zylf4nljdmqn28hvqns2g7hgm9mdkhlsvsjuvkxz", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCMkIwZGxNRGtubjVpRW5P\nWjBld2RlT1FoY0RRVTZpRFNXMk5aNHVZQlR3Cmpmd0tFYmV2Uk44UTNmdDVuVE8y\nb3NDQ1U3SE4zbCtIUkpmSk4rSWZKNVUKLS0tIGRKcHNrNXRXaG82TWJ3MTNKVFFp\nUTcwZ0JMQS9DLy9JMzJjK3BUNXVsclEKldzIpzvxGY8U4bbn+zjqgwHMYOyEzYpY\nEgx2c+C+/02xSznxyL1chX1BrpTN0l2SMY14WuTCGJReMkSAIaMF3w==\n-----END AGE ENCRYPTED FILE-----\n" - }, - { - "recipient": "age1nnm255ah9wa4gpsaq0v023a75lnmlcxszt9lc6az3mtwzxgrucfq45rp7h", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6M1VkaTRWeEZNL3dBZmFW\nNWtNZEdreENnM3NPV2tMU0lWUmcyVXJiVmhVCjFDaVlMNkNid3R0UmM0UmNtUWVX\ncEY0ZGx4eTZLbng5OUkwbEpFK3VOK28KLS0tIHpjS2tJWWN0UkVWWDdtc3JScEw2\nbC9hY241TEdIZUVvZVlkYjhSb0s0cDAKrmhD8R5U0TgqAEnRtkZopFmHaDx3iUNw\nuM3640d/PXgFBznw6fSF4Sf6FNhnO4hz0r8FtAE/8Zhq8avS2MMmmA==\n-----END AGE ENCRYPTED FILE-----\n" - } - ], - "lastmodified": "2023-09-03T06:35:00Z", - "mac": "ENC[AES256_GCM,data:+/P9Vmf+9+js7AtXqpCpBbdj/MgD4dzHcaO22Qomg5i7CqcUXvyXUTvFHusxNjScgbrhAbniW6WKi7wD8HfxWvrTwy5vTcAOHc9bDSRi3ZLK0t1jZPe6L42FAuJAnLOFI9yMgcL/mdzeUTGcJJblBNt+MeRx9zkl0wUTgL/hYVc=,iv:dlz7bh7zUo0FcTn0vPYg/B5l8kuDKg5mKXTjJOvLARA=,tag:0XkCIg7IUJ1PkexKhxcktg==,type:str]", - "pgp": null, - "unencrypted_suffix": "_unencrypted", - "version": "3.7.3" - } -} \ No newline at end of file diff --git a/sops/secrets/turingmachine-nncp/groups/admins b/sops/secrets/turingmachine-nncp/groups/admins deleted file mode 120000 index e5092e314..000000000 --- a/sops/secrets/turingmachine-nncp/groups/admins +++ /dev/null @@ -1 +0,0 @@ -../../../groups/admins \ No newline at end of file diff --git a/sops/secrets/turingmachine-nncp/machines/turingmachine b/sops/secrets/turingmachine-nncp/machines/turingmachine deleted file mode 120000 index dfad1c3d9..000000000 --- a/sops/secrets/turingmachine-nncp/machines/turingmachine +++ /dev/null @@ -1 +0,0 @@ -../../../machines/turingmachine \ No newline at end of file diff --git a/sops/secrets/turingmachine-nncp/secret b/sops/secrets/turingmachine-nncp/secret deleted file mode 100644 index 88dc5f8fc..000000000 --- a/sops/secrets/turingmachine-nncp/secret +++ /dev/null @@ -1,28 +0,0 @@ -{ - "data": "ENC[AES256_GCM,data:1pQ+mIUC5XZ651KZAUUiB7Tg1//NrcUVetpGXqMIQ6FKQSnZbKdIBKZ/mm34bd0HNAKviQE5xbyqEE0tdnQ+JTzIBiZ2sfQRHbqu3MUcLoOkiRQZW8pymDVteLgQXfs8SBE5t6CulMYl+jFcTuptU9yYNnnJDeKMisDKvgjmpDmFiem5dJVRJIGDt6CIfjs6UkqPY7E+vD7KNIxUBUQTtSjEG3ANpZ02uc6DI2AE0glpFuqzvniaOyDLykSjmNhaIfokKQ8CAZSKbvU7tSXQ0NcF3TA/MkW0ZsU6RJSFlTWyOeWFs1uHSI4FYXHvpeQnzGTpDsCNIH6KE1do0+ma3C31jrjsLLcquCV4wI8wPG0jd9RwG+kYn3GZB6yNXYNxZw/U2y3gnLlJmjJ6bj3lnc625ugH04Gc1adFOnV47tcAR76fku3pYS8S9Eow/QWk+Afjr4ahbZRa9em82OqbDPXiYTj0zX6T3fnYDNtuOjxPYwWU4cKsR0EsJvb/FVpXYfo8oKyjD9ODUNcTy6BFFY3MklfMo79LxW7PCbofmaLN8/HcJ9q981rqc56Kvn8u9i6ac0UbSCeeWChLaVdY6ZVs7ZB8OFFds9wMic29FKIRsCU3yu+ara2Z66Bv9EC0nzPp0r129j0TKRS/mi8B9n6cJh80Sagk2w3gg+Zulz3tOqUnXIbxQsy8JhnhBXav8XM+4s49R2MYYS7D0XLCOU9QxiInX+bQZvtS16/ZpULW035VEMGBmYcI/MMh5JsJMVro6rXZO4S4DxyCOYaa1LO3o0Bh72smL+Ws+MGkCdYCqVWvkPTdT57t/CTspf7ommFDsfD3Lij8xuOzsth0itTiXZHQCoY/DMK+mFqiqMyOrLXWbKIAP1/8HIEs/bjFky3PskqFrtU8jA4m+AEFZ0GrvUWrSuOIv2sEHsY06GY0XXesoQ86t8ZUEKQ18pFdAo5Sff7vuaPYebi2aD6ecAzhViA5+t3PutJy+sis7M4X3untRrHnM9Wk0AD8nxycAWKKPoMSamriLtIY48mjCYm+DWcYe9c1qwIEQw93fw3XQQ1PYZQfkcnw5mRv3peJA3Rziw9e7mDgaYtRU8p7q+zIw/iatIySJExHUnVrKGE8m3N/oaNoMeSojILmmw4q6Gk1WhpXvNdQhy6R0iHDjhkiy0sKmMXFAWOihBOAFh9ucWz36bEJKV2QAytj8eE2nNzOkEjMc6pbDqgdzNWYgLSeK+Cvp2pEcoYJI2qJ/rQxezzGRZE0yQcoExEUa4LlBkel6c75XelGJEuXgvjNU5p4T/sVadBVEkzsgaGewE6lTHy241g2vVEE9sk4H3mehRYvmolVCFFqVvwBDDxYQVWcWBP6Git0hmWJjaElnw/OuqNdjo4HAKlzyNHypxAuJmnNsOA=,iv:Wj+l/XKu3vVRPk/gt1luO13qmycQNewabgak3Fi8CS0=,tag:lttJo4Pr0e7zN5wouJ6KgA==,type:str]", - "sops": { - "kms": null, - "gcp_kms": null, - "azure_kv": null, - "hc_vault": null, - "age": [ - { - "recipient": "age1v8a8na9tw8jskkuxnhmd50ltlhmnz0eava4rcxk4pvrnr9ykypfqpkrsd6", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKVEhvYkhxaFJDSElTWktS\nMU1FbTl5b2RsWHAzNkt2MlorblAzdGNkR25jCnRGVmQxalA3azlCWGxJWms3Vkg2\nMzFsWVlLcDNUVDlqWC9KQ3FyZXhEdHMKLS0tIHVVMFZiZXUydFhKdzl0M2ZSMVdW\nTkU4MndmSDhidExYUzZZcFFQbVozOXMKR4+NZAgsq5eNI+4alcXn4iXd4YnSmWt3\nh5w7yrsn/c/081aAraHY0zwtpCM0j95Q6/WXFxR/IhcU5pTdx2RzWA==\n-----END AGE ENCRYPTED FILE-----\n" - }, - { - "recipient": "age17n64ahe3wesh8l8lj0zylf4nljdmqn28hvqns2g7hgm9mdkhlsvsjuvkxz", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwUFdEWG5xa09CYmQrZFdn\nM0R3SW9yOUhXczRoTnBodFRibndkeTVuMlc4CkkvcEFBRVlaRUd4QTJQUmQxNTRE\nYVpoVWo3MEN2c21MY0JaSUdqVHZEc1EKLS0tIFNCcFNmTnZtME4yaEo5L0tlR21v\nSWNhTU9SdFRhRkExSno4cUgwemhPUGcKBrQycSRVqfQxOuLRe/9a+VVBE0ZPai5E\nj/cu+0wuuwnaZTbsGRe/wH4oTl677JACs4x2wzfijoUH+NiFUAszYw==\n-----END AGE ENCRYPTED FILE-----\n" - }, - { - "recipient": "age1nnm255ah9wa4gpsaq0v023a75lnmlcxszt9lc6az3mtwzxgrucfq45rp7h", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnODNvc2hMMWk1RUwweUQv\nU1hXamxQODJkdDZIR0lXeGdsWVBmWDlNQXlJCnV0Zk40UFQ4RzdqeHJlcTN2eTdX\nbzZUOXlBK3Q0VlliTkxwTmlZbHl0V0EKLS0tIDlZeG9RZ1pxNWhOaXBjK2JUL2Ry\nQXBWQjkyZFlxTE53aUt1M0tBaWZIS1kKKdRxkURmna/SuUH6yZr2Ys1SbL3uyFlA\nrIzZ+psqMJcvScnj407eJYuLsTVwldYd+l8tqIEiPaIaR/vK7sKC0w==\n-----END AGE ENCRYPTED FILE-----\n" - } - ], - "lastmodified": "2023-09-03T06:49:52Z", - "mac": "ENC[AES256_GCM,data:zWWjl+UeALFNzD86+HIAKHfS8NLgb7gZwelrD3pCd56Ii0KmnZ7PfXMBqsDf8ikMzUUxIdG1YHfdXLJgxq9xamHJ/H7jL5sv2lp+1jzoUGU8Lpc5kMKwB/2me2nmYWaDei0wPKuSvreDYvLs26gnM8RirnXhAWMJ6WWZwAQpnSc=,iv:TXnUAoCtTLmwnYW0m/Y3a17HqX5jOeRhqUlQSQzGayw=,tag:H/BZ0LsTebHot9agt7fvkA==,type:str]", - "pgp": null, - "unencrypted_suffix": "_unencrypted", - "version": "3.7.3" - } -} \ No newline at end of file