make rclone master

.github/workflows/build-machines-and-homes.yml

@@ -7,7 +7,7 @@ env:
   ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN }}
   NIX_CONFIG: |
     show-trace = true
-    extra-substituters = https://cache.cy7.sh/main
+    extra-substituters = https://cdn.cy7.sh/main
     extra-trusted-public-keys = main:Ku31HoEWcBtfggge2VGj+QTkVrQuIwRIMGyfV/5VQP0=
     experimental-features = nix-command flakes
     accept-flake-config = true

.github/workflows/build-packages.yml

@@ -10,7 +10,7 @@ env:
   ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN }}
   NIX_CONFIG: |
     show-trace = true
-    extra-substituters = https://cache.cy7.sh/main
+    extra-substituters = https://cdn.cy7.sh/main
     extra-trusted-public-keys = main:Ku31HoEWcBtfggge2VGj+QTkVrQuIwRIMGyfV/5VQP0=
     experimental-features = nix-command flakes
     accept-flake-config = true

flake.nix

@@ -107,7 +107,7 @@
   nixConfig = {
     extra-substituters = [
       "https://nix-community.cachix.org"
-      "https://cache.cy7.sh/main"
+      "https://cdn.cy7.sh/main"
     ];
     extra-trusted-public-keys = [
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="

hosts/chunk/rclone.nix

@@ -44,15 +44,17 @@
           --config ${config.sops.secrets."rclone/config".path} \
           --allow-other \
           --cache-dir /var/cache/rclone \
-          --transfers=32 \
+          --transfers 32 \
           --vfs-cache-mode full \
           --vfs-cache-min-free-space 5G \
           --dir-cache-time 30d \
           --no-checksum \
           --no-modtime \
           --vfs-fast-fingerprint \
-          --vfs-read-chunk-size 10M \
-          --vfs-read-chunk-streams 32 \
+          --vfs-read-chunk-size 4M \
+          --vfs-read-chunk-streams 64 \
+          --sftp-concurrency 128 \
+          --sftp-chunk-size 255k \
           rsyncnet:garage /mnt/garage
       '';
       ExecStop = "${lib.getExe' pkgs.fuse "fusermount"} -u /mnt/garage";

hosts/common.nix

@@ -15,7 +15,7 @@
       ];
       extra-substituters = [
         "https://nix-community.cachix.org"
-        "https://cache.cy7.sh/main"
+        "https://cdn.cy7.sh/main"
       ];
     };
     channel.enable = false;

modules/attic.nix

@@ -18,7 +18,7 @@ in
       settings = {
         listen = "[::]:8091";
         api-endpoint = "https://cache.cy7.sh/";
-        allowed-hosts = [ "cache.cy7.sh" ];
+        allowed-hosts = [ "cache.cy7.sh" "cdn.cy7.sh" ];
         require-proof-of-possession = false;
         compression = {
           type = "none";
@@ -39,9 +39,12 @@ in
       };
     };
 
-    services.caddy.virtualHosts."cache.cy7.sh".extraConfig = ''
-      import common
-      reverse_proxy localhost:8091
-    '';
+    services.caddy.virtualHosts."cache.cy7.sh" = {
+      serverAliases = [ "cdn.cy7.sh" ];
+      extraConfig = ''
+        import common
+        reverse_proxy localhost:8091
+      '';
+    };
   };
 }