From d707766e0ba9715513fe87b5aaa7b9e6fb75adaa Mon Sep 17 00:00:00 2001
From: chaos <chaoticryptidz@owo.monster>
Date: Wed, 9 Aug 2023 21:36:19 +0100
Subject: [PATCH] remove hetznervm restic from storage, fix git name

---
 home/dev/all/git.nix                                |  2 +-
 hosts/hetzner-vm/containers/storage/data/ports.nix  | 13 ++++++-------
 .../containers/storage/profiles/rclone-serve.nix    | 11 -----------
 .../containers/storage/profiles/secrets.nix         |  9 ---------
 hosts/hetzner-vm/containers/storage/storage.nix     |  1 -
 hosts/vault/profiles/restic.nix                     |  2 +-
 6 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/home/dev/all/git.nix b/home/dev/all/git.nix
index 69fd922..8c2ce9e 100644
--- a/home/dev/all/git.nix
+++ b/home/dev/all/git.nix
@@ -3,7 +3,7 @@
     enable = true;
     lfs.enable = true;
     package = pkgs.gitAndTools.gitFull;
-    userName = "Chaos";
+    userName = "chaos";
     userEmail = "chaoticryptidz@owo.monster";
     extraConfig = {credential = {helper = "store";};};
   };
diff --git a/hosts/hetzner-vm/containers/storage/data/ports.nix b/hosts/hetzner-vm/containers/storage/data/ports.nix
index 6f292f2..9725698 100644
--- a/hosts/hetzner-vm/containers/storage/data/ports.nix
+++ b/hosts/hetzner-vm/containers/storage/data/ports.nix
@@ -3,13 +3,12 @@
   rclone_serve_webdav_media = 4201;
   rclone_serve_webdav_music_ro = 4202;
 
-  rclone_serve_restic_hvm = 4210;
-  rclone_serve_restic_music = 4211;
-  rclone_serve_restic_vault = 4212;
-  rclone_serve_restic_social = 4213;
-  rclone_serve_restic_quassel = 4214;
-  rclone_serve_restic_piped = 4215;
-  rclone_serve_restic_mail = 4216;
+  rclone_serve_restic_music = 4210;
+  rclone_serve_restic_vault = 4211;
+  rclone_serve_restic_social = 4212;
+  rclone_serve_restic_quassel = 4213;
+  rclone_serve_restic_piped = 4214;
+  rclone_serve_restic_mail = 4215;
 
   rclone_serve_http_music = 4220;
   rclone_serve_http_public = 4221;
diff --git a/hosts/hetzner-vm/containers/storage/profiles/rclone-serve.nix b/hosts/hetzner-vm/containers/storage/profiles/rclone-serve.nix
index 8dcbb43..b539657 100644
--- a/hosts/hetzner-vm/containers/storage/profiles/rclone-serve.nix
+++ b/hosts/hetzner-vm/containers/storage/profiles/rclone-serve.nix
@@ -77,17 +77,6 @@ in {
         ];
         inherit serviceConfig;
       }
-      {
-        user = "storage";
-        remote = "StorageBox:Backups/Restic/HetznerVM";
-        type = "restic";
-        extraArgs = [
-          "--addr=0.0.0.0:${toString ports.rclone_serve_restic_hvm}"
-          "--htpasswd=${secrets.restic_hetznervm_htpasswd.path}"
-          "--baseurl=/HetznerVM/"
-        ];
-        inherit serviceConfig;
-      }
       {
         user = "storage";
         remote = "StorageBox:Backups/Restic/Music";
diff --git a/hosts/hetzner-vm/containers/storage/profiles/secrets.nix b/hosts/hetzner-vm/containers/storage/profiles/secrets.nix
index 9bd1612..c4b63b1 100644
--- a/hosts/hetzner-vm/containers/storage/profiles/secrets.nix
+++ b/hosts/hetzner-vm/containers/storage/profiles/secrets.nix
@@ -44,15 +44,6 @@
     secrets = {
       vault_password = {manual = true;};
 
-      restic_hetznervm_htpasswd = {
-        user = "storage";
-        group = "storage";
-        fetchScript = ''
-          username=$(simple_get "/api-keys/storage/restic/HetznerVM" .username)
-          password=$(simple_get "/api-keys/storage/restic/HetznerVM" .password)
-          htpasswd -bc "$secretFile" "$username" "$password" 2>/dev/null
-        '';
-      };
       restic_music_htpasswd = {
         user = "storage";
         group = "storage";
diff --git a/hosts/hetzner-vm/containers/storage/storage.nix b/hosts/hetzner-vm/containers/storage/storage.nix
index 56f131d..9d87a78 100644
--- a/hosts/hetzner-vm/containers/storage/storage.nix
+++ b/hosts/hetzner-vm/containers/storage/storage.nix
@@ -95,7 +95,6 @@ in {
     forceSSL = true;
     enableACME = true;
     locations = {
-      "/HetznerVM/".proxyPass = "http://${containerIP}:${toString ports.rclone_serve_restic_hvm}";
       "/Music/".proxyPass = "http://${containerIP}:${toString ports.rclone_serve_restic_music}";
       "/Vault/".proxyPass = "http://${containerIP}:${toString ports.rclone_serve_restic_vault}";
       "/Social/".proxyPass = "http://${containerIP}:${toString ports.rclone_serve_restic_social}";
diff --git a/hosts/vault/profiles/restic.nix b/hosts/vault/profiles/restic.nix
index e9b5b37..7bf4f44 100644
--- a/hosts/vault/profiles/restic.nix
+++ b/hosts/vault/profiles/restic.nix
@@ -13,7 +13,7 @@ in {
       OnCalendar = "daily";
     };
     # env contains fixed repository with auth
-    repository = "rest:https://storage-restic.owo.monster/HetznerVM";
+    repository = "rest:https://storage-restic.owo.monster/Vault";
     passwordFile = "${secrets.restic_password.path}";
     environmentFile = "${secrets.restic_env.path}";
   };