fix: make cache serve s3

hosts/best/cache.nix

@@ -0,0 +1,18 @@
+{ self, config, lib, ... }: let
+  inherit (config.networking) domain;
+  inherit (lib) merge;
+
+  fqdn = "cache.${domain}";
+in {
+  imports = [(self + /modules/nginx.nix)];
+
+  services.nginx.virtualHosts.${fqdn} = merge config.services.nginx.sslTemplate {
+    locations."/" = {
+      extraConfig = /* nginx */ ''
+        proxy_set_header Host "hercules.${config.services.garage.settings.s3_api.root_domain}";
+      '';
+
+      proxyPass = "http://${config.services.garage.settings.s3_api.api_bind_addr}";
+    };
+  };
+}

hosts/best/garage/default.nix

@@ -3,8 +3,8 @@
   inherit (lib) enabled merge;
 
   fqdn    = "s3.${domain}";
-  portS3  = 8004;
-  portRpc = 8005;
+  portS3  = 8003;
+  portRpc = 8004;
 in {
   imports = [(self + /modules/nginx.nix)];
 

hosts/best/nix-serve/default.nix

@@ -1,27 +0,0 @@
-{ self, config, lib, pkgs, ... }: let
-  inherit (config.networking) domain;
-  inherit (lib) enabled merge;
-
-  fqdn = "cache.${domain}";
-  port = 8003;
-in {
-  imports = [(self + /modules/nginx.nix)];
-
-  secrets.nixServeKey = {
-    file  = ./key.age;
-    owner = "nix-serve";
-  };
-
-  services.nix-serve = enabled {
-    package       = pkgs.nix-serve-ng;
-    secretKeyFile = config.secrets.nixServeKey.path;
-
-    # Not ::1 because nix-serve doesn't like that.
-    bindAddress = "127.0.0.1";
-    inherit port;
-  };
-
-  services.nginx.virtualHosts.${fqdn} = merge config.services.nginx.sslTemplate {
-    locations."/".proxyPass = "http://127.0.0.1:${toString port}";
-  };
-}

hosts/best/nix-serve/key.age

@@ -1,8 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 8y3T6w +fPOWUbuD+JGfimuJnNa0wBpQyxC2nXGLGFdxAhfwns
-bonLQGaN8rp0KmZHW9efsPyCQ8eujuxEB9p7Ewdp4Bo
--> ssh-ed25519 CzqbPQ 91liBCRmtq4YGG8Zz6+ObSEDlGVmA8Jn+NPQzTLQoGY
-Gurxg2Tp1sdpz7xESiZCVw5BAuMI5vYH/UtdrFH9vd0
---- MJVivHhiqkVMke+mib2EZiFeZFX/BnFuEUctH+fdwd4
-8k
-Ôh}p©®lðz¾!I{­xÃ
<0A>z@SíZy/‘ôC3JÞQ:t¯ñ»NS&<26>CXw<58>·`%ÕûE	{£f'Oä<Äq‹<71>ï\‚;yù‚S—AöùÒ!‚Û_Ù<pñJ „@#‰Û·É(Õ63(«/G·ØgãIvÄ%ýºœ†

secrets.nix

@@ -12,8 +12,6 @@ in {
   "hosts/best/hercules/secrets.age".publicKeys      = [ best ] ++ admins;
   "hosts/best/hercules/token.age".publicKeys        = [ best ] ++ admins;
 
-  "hosts/best/nix-serve/key.age".publicKeys     = [ best ] ++ admins;
-
   # cube
   "hosts/cube/id.age".publicKeys                      = [ cube ] ++ admins;
   "hosts/cube/password.rgb.age".publicKeys            = [ cube ] ++ admins;