From 8525509d158fe00400925a2207a634016d630091 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 2 Oct 2023 01:07:30 +0200
Subject: [PATCH] secrets: rename common secrets

---
 2configs/bgt/hidden_service.nix                               | 4 ++--
 2configs/remote-build/slave.nix                               | 2 +-
 .../machines/gum                                              | 0
 .../secret                                                    | 0
 .../users/makefu                                              | 0
 sops/secrets/{gum-dl.gum-auth => dl.gum-auth}/machines/gum    | 0
 sops/secrets/{gum-dl.gum-auth => dl.gum-auth}/secret          | 0
 sops/secrets/{gum-dl.gum-auth => dl.gum-auth}/users/makefu    | 0
 sops/secrets/{gum-hetzner.smb => hetzner.smb}/machines/gum    | 0
 sops/secrets/{gum-hetzner.smb => hetzner.smb}/secret          | 0
 sops/secrets/{gum-hetzner.smb => hetzner.smb}/users/makefu    | 0
 sops/secrets/{gum-iodinepw => iodinepw}/machines/gum          | 0
 sops/secrets/{gum-iodinepw => iodinepw}/secret                | 0
 sops/secrets/{gum-iodinepw => iodinepw}/users/makefu          | 0
 .../machines/gum                                              | 0
 .../{gum-lego-binaergewitter => lego-binaergewitter}/secret   | 0
 .../users/makefu                                              | 0
 .../machines/gum                                              | 0
 .../secret                                                    | 0
 .../users/makefu                                              | 0
 .../machines/gum                                              | 0
 .../{gum-nextcloud-admin-pw => nextcloud-admin-pw}/secret     | 0
 .../users/makefu                                              | 0
 .../{gum-nextcloud-db-pw => nextcloud-db-pw}/machines/gum     | 0
 sops/secrets/{gum-nextcloud-db-pw => nextcloud-db-pw}/secret  | 0
 .../{gum-nextcloud-db-pw => nextcloud-db-pw}/users/makefu     | 0
 .../secrets/{gum-nix-serve.key => nix-serve.key}/machines/gum | 0
 sops/secrets/{gum-nix-serve.key => nix-serve.key}/secret      | 0
 .../secrets/{gum-nix-serve.key => nix-serve.key}/users/makefu | 0
 sops/secrets/{gum-tw-pass.ini => tw-pass.ini}/machines/gum    | 0
 sops/secrets/{gum-tw-pass.ini => tw-pass.ini}/secret          | 0
 sops/secrets/{gum-tw-pass.ini => tw-pass.ini}/users/makefu    | 0
 32 files changed, 3 insertions(+), 3 deletions(-)
 rename sops/secrets/{gum-dl.euer.krebsco.de-auth => dl.euer.krebsco.de-auth}/machines/gum (100%)
 rename sops/secrets/{gum-dl.euer.krebsco.de-auth => dl.euer.krebsco.de-auth}/secret (100%)
 rename sops/secrets/{gum-dl.euer.krebsco.de-auth => dl.euer.krebsco.de-auth}/users/makefu (100%)
 rename sops/secrets/{gum-dl.gum-auth => dl.gum-auth}/machines/gum (100%)
 rename sops/secrets/{gum-dl.gum-auth => dl.gum-auth}/secret (100%)
 rename sops/secrets/{gum-dl.gum-auth => dl.gum-auth}/users/makefu (100%)
 rename sops/secrets/{gum-hetzner.smb => hetzner.smb}/machines/gum (100%)
 rename sops/secrets/{gum-hetzner.smb => hetzner.smb}/secret (100%)
 rename sops/secrets/{gum-hetzner.smb => hetzner.smb}/users/makefu (100%)
 rename sops/secrets/{gum-iodinepw => iodinepw}/machines/gum (100%)
 rename sops/secrets/{gum-iodinepw => iodinepw}/secret (100%)
 rename sops/secrets/{gum-iodinepw => iodinepw}/users/makefu (100%)
 rename sops/secrets/{gum-lego-binaergewitter => lego-binaergewitter}/machines/gum (100%)
 rename sops/secrets/{gum-lego-binaergewitter => lego-binaergewitter}/secret (100%)
 rename sops/secrets/{gum-lego-binaergewitter => lego-binaergewitter}/users/makefu (100%)
 rename sops/secrets/{gum-mediawikibot-config.json => mediawikibot-config.json}/machines/gum (100%)
 rename sops/secrets/{gum-mediawikibot-config.json => mediawikibot-config.json}/secret (100%)
 rename sops/secrets/{gum-mediawikibot-config.json => mediawikibot-config.json}/users/makefu (100%)
 rename sops/secrets/{gum-nextcloud-admin-pw => nextcloud-admin-pw}/machines/gum (100%)
 rename sops/secrets/{gum-nextcloud-admin-pw => nextcloud-admin-pw}/secret (100%)
 rename sops/secrets/{gum-nextcloud-admin-pw => nextcloud-admin-pw}/users/makefu (100%)
 rename sops/secrets/{gum-nextcloud-db-pw => nextcloud-db-pw}/machines/gum (100%)
 rename sops/secrets/{gum-nextcloud-db-pw => nextcloud-db-pw}/secret (100%)
 rename sops/secrets/{gum-nextcloud-db-pw => nextcloud-db-pw}/users/makefu (100%)
 rename sops/secrets/{gum-nix-serve.key => nix-serve.key}/machines/gum (100%)
 rename sops/secrets/{gum-nix-serve.key => nix-serve.key}/secret (100%)
 rename sops/secrets/{gum-nix-serve.key => nix-serve.key}/users/makefu (100%)
 rename sops/secrets/{gum-tw-pass.ini => tw-pass.ini}/machines/gum (100%)
 rename sops/secrets/{gum-tw-pass.ini => tw-pass.ini}/secret (100%)
 rename sops/secrets/{gum-tw-pass.ini => tw-pass.ini}/users/makefu (100%)

diff --git a/2configs/bgt/hidden_service.nix b/2configs/bgt/hidden_service.nix
index 35ae992..1f82e9e 100644
--- a/2configs/bgt/hidden_service.nix
+++ b/2configs/bgt/hidden_service.nix
@@ -6,12 +6,12 @@ let
   srvdir = "/var/lib/tor/onion/";
 in
   {
-  sops.secrets."${name}/private_key" = {
+  sops.secrets."${name}-private_key" = {
     path = "${srvdir}/${name}/private_key";
     owner = "tor";
     restartUnits = [ "tor.service" ];
   };
-  sops.secrets."${name}/hostname" = {
+  sops.secrets."${name}-hostname" = {
     path = "${srvdir}/${name}/hostname";
     owner = "tor";
     restartUnits = [ "tor.service" ];
diff --git a/2configs/remote-build/slave.nix b/2configs/remote-build/slave.nix
index 9e46b6c..fbc78b0 100644
--- a/2configs/remote-build/slave.nix
+++ b/2configs/remote-build/slave.nix
@@ -1,5 +1,5 @@
 {config,...}:{
-  nix.settings.strusted-users = [ "nixBuild" ];
+  nix.settings.trusted-users = [ "nixBuild" ];
   users.users.nixBuild = {
     name = "nixBuild";
     isNormalUser = true;
diff --git a/sops/secrets/gum-dl.euer.krebsco.de-auth/machines/gum b/sops/secrets/dl.euer.krebsco.de-auth/machines/gum
similarity index 100%
rename from sops/secrets/gum-dl.euer.krebsco.de-auth/machines/gum
rename to sops/secrets/dl.euer.krebsco.de-auth/machines/gum
diff --git a/sops/secrets/gum-dl.euer.krebsco.de-auth/secret b/sops/secrets/dl.euer.krebsco.de-auth/secret
similarity index 100%
rename from sops/secrets/gum-dl.euer.krebsco.de-auth/secret
rename to sops/secrets/dl.euer.krebsco.de-auth/secret
diff --git a/sops/secrets/gum-dl.euer.krebsco.de-auth/users/makefu b/sops/secrets/dl.euer.krebsco.de-auth/users/makefu
similarity index 100%
rename from sops/secrets/gum-dl.euer.krebsco.de-auth/users/makefu
rename to sops/secrets/dl.euer.krebsco.de-auth/users/makefu
diff --git a/sops/secrets/gum-dl.gum-auth/machines/gum b/sops/secrets/dl.gum-auth/machines/gum
similarity index 100%
rename from sops/secrets/gum-dl.gum-auth/machines/gum
rename to sops/secrets/dl.gum-auth/machines/gum
diff --git a/sops/secrets/gum-dl.gum-auth/secret b/sops/secrets/dl.gum-auth/secret
similarity index 100%
rename from sops/secrets/gum-dl.gum-auth/secret
rename to sops/secrets/dl.gum-auth/secret
diff --git a/sops/secrets/gum-dl.gum-auth/users/makefu b/sops/secrets/dl.gum-auth/users/makefu
similarity index 100%
rename from sops/secrets/gum-dl.gum-auth/users/makefu
rename to sops/secrets/dl.gum-auth/users/makefu
diff --git a/sops/secrets/gum-hetzner.smb/machines/gum b/sops/secrets/hetzner.smb/machines/gum
similarity index 100%
rename from sops/secrets/gum-hetzner.smb/machines/gum
rename to sops/secrets/hetzner.smb/machines/gum
diff --git a/sops/secrets/gum-hetzner.smb/secret b/sops/secrets/hetzner.smb/secret
similarity index 100%
rename from sops/secrets/gum-hetzner.smb/secret
rename to sops/secrets/hetzner.smb/secret
diff --git a/sops/secrets/gum-hetzner.smb/users/makefu b/sops/secrets/hetzner.smb/users/makefu
similarity index 100%
rename from sops/secrets/gum-hetzner.smb/users/makefu
rename to sops/secrets/hetzner.smb/users/makefu
diff --git a/sops/secrets/gum-iodinepw/machines/gum b/sops/secrets/iodinepw/machines/gum
similarity index 100%
rename from sops/secrets/gum-iodinepw/machines/gum
rename to sops/secrets/iodinepw/machines/gum
diff --git a/sops/secrets/gum-iodinepw/secret b/sops/secrets/iodinepw/secret
similarity index 100%
rename from sops/secrets/gum-iodinepw/secret
rename to sops/secrets/iodinepw/secret
diff --git a/sops/secrets/gum-iodinepw/users/makefu b/sops/secrets/iodinepw/users/makefu
similarity index 100%
rename from sops/secrets/gum-iodinepw/users/makefu
rename to sops/secrets/iodinepw/users/makefu
diff --git a/sops/secrets/gum-lego-binaergewitter/machines/gum b/sops/secrets/lego-binaergewitter/machines/gum
similarity index 100%
rename from sops/secrets/gum-lego-binaergewitter/machines/gum
rename to sops/secrets/lego-binaergewitter/machines/gum
diff --git a/sops/secrets/gum-lego-binaergewitter/secret b/sops/secrets/lego-binaergewitter/secret
similarity index 100%
rename from sops/secrets/gum-lego-binaergewitter/secret
rename to sops/secrets/lego-binaergewitter/secret
diff --git a/sops/secrets/gum-lego-binaergewitter/users/makefu b/sops/secrets/lego-binaergewitter/users/makefu
similarity index 100%
rename from sops/secrets/gum-lego-binaergewitter/users/makefu
rename to sops/secrets/lego-binaergewitter/users/makefu
diff --git a/sops/secrets/gum-mediawikibot-config.json/machines/gum b/sops/secrets/mediawikibot-config.json/machines/gum
similarity index 100%
rename from sops/secrets/gum-mediawikibot-config.json/machines/gum
rename to sops/secrets/mediawikibot-config.json/machines/gum
diff --git a/sops/secrets/gum-mediawikibot-config.json/secret b/sops/secrets/mediawikibot-config.json/secret
similarity index 100%
rename from sops/secrets/gum-mediawikibot-config.json/secret
rename to sops/secrets/mediawikibot-config.json/secret
diff --git a/sops/secrets/gum-mediawikibot-config.json/users/makefu b/sops/secrets/mediawikibot-config.json/users/makefu
similarity index 100%
rename from sops/secrets/gum-mediawikibot-config.json/users/makefu
rename to sops/secrets/mediawikibot-config.json/users/makefu
diff --git a/sops/secrets/gum-nextcloud-admin-pw/machines/gum b/sops/secrets/nextcloud-admin-pw/machines/gum
similarity index 100%
rename from sops/secrets/gum-nextcloud-admin-pw/machines/gum
rename to sops/secrets/nextcloud-admin-pw/machines/gum
diff --git a/sops/secrets/gum-nextcloud-admin-pw/secret b/sops/secrets/nextcloud-admin-pw/secret
similarity index 100%
rename from sops/secrets/gum-nextcloud-admin-pw/secret
rename to sops/secrets/nextcloud-admin-pw/secret
diff --git a/sops/secrets/gum-nextcloud-admin-pw/users/makefu b/sops/secrets/nextcloud-admin-pw/users/makefu
similarity index 100%
rename from sops/secrets/gum-nextcloud-admin-pw/users/makefu
rename to sops/secrets/nextcloud-admin-pw/users/makefu
diff --git a/sops/secrets/gum-nextcloud-db-pw/machines/gum b/sops/secrets/nextcloud-db-pw/machines/gum
similarity index 100%
rename from sops/secrets/gum-nextcloud-db-pw/machines/gum
rename to sops/secrets/nextcloud-db-pw/machines/gum
diff --git a/sops/secrets/gum-nextcloud-db-pw/secret b/sops/secrets/nextcloud-db-pw/secret
similarity index 100%
rename from sops/secrets/gum-nextcloud-db-pw/secret
rename to sops/secrets/nextcloud-db-pw/secret
diff --git a/sops/secrets/gum-nextcloud-db-pw/users/makefu b/sops/secrets/nextcloud-db-pw/users/makefu
similarity index 100%
rename from sops/secrets/gum-nextcloud-db-pw/users/makefu
rename to sops/secrets/nextcloud-db-pw/users/makefu
diff --git a/sops/secrets/gum-nix-serve.key/machines/gum b/sops/secrets/nix-serve.key/machines/gum
similarity index 100%
rename from sops/secrets/gum-nix-serve.key/machines/gum
rename to sops/secrets/nix-serve.key/machines/gum
diff --git a/sops/secrets/gum-nix-serve.key/secret b/sops/secrets/nix-serve.key/secret
similarity index 100%
rename from sops/secrets/gum-nix-serve.key/secret
rename to sops/secrets/nix-serve.key/secret
diff --git a/sops/secrets/gum-nix-serve.key/users/makefu b/sops/secrets/nix-serve.key/users/makefu
similarity index 100%
rename from sops/secrets/gum-nix-serve.key/users/makefu
rename to sops/secrets/nix-serve.key/users/makefu
diff --git a/sops/secrets/gum-tw-pass.ini/machines/gum b/sops/secrets/tw-pass.ini/machines/gum
similarity index 100%
rename from sops/secrets/gum-tw-pass.ini/machines/gum
rename to sops/secrets/tw-pass.ini/machines/gum
diff --git a/sops/secrets/gum-tw-pass.ini/secret b/sops/secrets/tw-pass.ini/secret
similarity index 100%
rename from sops/secrets/gum-tw-pass.ini/secret
rename to sops/secrets/tw-pass.ini/secret
diff --git a/sops/secrets/gum-tw-pass.ini/users/makefu b/sops/secrets/tw-pass.ini/users/makefu
similarity index 100%
rename from sops/secrets/gum-tw-pass.ini/users/makefu
rename to sops/secrets/tw-pass.ini/users/makefu