Merge branch 'new-attic'

hosts/chunk/attic.nix

@@ -7,32 +7,26 @@
 
     settings = {
       listen = "[::]:8090";
-      api-endpoint = "https://cache.cything.io/";
+      api-endpoint = "https://cache.cy7.sh/";
-      allowed-hosts = [ "cache.cything.io" ];
+      allowed-hosts = [ "cache.cy7.sh" ];
       require-proof-of-possession = false;
       compression.type = "zstd";
       database.url = "postgresql:///atticd?host=/run/postgresql";
 
       storage = {
-        type = "local";
+        type = "s3";
-        path = "/mnt/attic";
+        region = "auto";
+        bucket = "attic";
+        endpoint = "https://e3e97aac307d106a7becea43cef8fcbd.r2.cloudflarestorage.com";
       };
 
       garbage-collection = {
-        default-retention-period = "3 months";
+        default-retention-period = "2 weeks";
-      };
-
-      chunking = {
-        nar-size-threshold = 0; # disables chunking
-        min-size = 0;
-        avg-size = 0;
-        max-size = 0;
-        concurrent-chunk-uploads = 32;
       };
     };
   };
 
-  services.caddy.virtualHosts."cache.cything.io".extraConfig = ''
+  services.caddy.virtualHosts."cache.cy7.sh".extraConfig = ''
     import common
     reverse_proxy localhost:8090
   '';

overlay/attic/concurrent-32.patch

@@ -0,0 +1,13 @@
+diff --git a/server/src/config.rs b/server/src/config.rs
+index 4412cbf..6dd483a 100644
+--- a/server/src/config.rs
++++ b/server/src/config.rs
+@@ -565,7 +565,7 @@ fn default_default_retention_period() -> Duration {
+ }
+ 
+ fn default_concurrent_chunk_uploads() -> usize {
+-    10
++    32
+ }
+ 
+ fn load_config_from_path(path: &Path) -> Result<Config> {

overlay/attic/default.nix

@@ -16,6 +16,9 @@ final: prev: {
             cargoLock = null;
             cargoHash = "sha256-AbpWnYfBMrR6oOfy2LkQvIPYsClCWE89bJav+iHTtLM=";
             useFetchCargoVendor = true;
+            patches = [
+              ./concurrent-32.patch
+            ];
           }
         );
     };