From 6b2b2595cfaebdd3a5718d80b8698bac908e19f2 Mon Sep 17 00:00:00 2001
From: Max Audron <audron@cocaine.farm>
Date: Fri, 1 Aug 2025 00:47:06 +0200
Subject: update garage to 2.0

---
 modules/garage/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/garage/default.nix b/modules/garage/default.nix
index 98a3bf7..595b004 100644
--- a/modules/garage/default.nix
+++ b/modules/garage/default.nix
@@ -4,7 +4,7 @@ with self.lib.nginx;
 {
   services.garage = {
     enable = true;
-    package = pkgs.garage_1_x;
+    package = pkgs.garage_2_0_0;
     settings = {
       replication_factor = 3;
       consistency_mode = "consistent";
@@ -20,6 +20,10 @@ with self.lib.nginx;
 
       bootstrap_peers = [ ];
 
+      admin = {
+        api_bind_addr = "${config.wireguard.v4.address}:3903";
+      };
+
       s3_api = {
         s3_region = "cdn";
         api_bind_addr = "127.0.0.1:3900";
@@ -41,9 +45,9 @@ with self.lib.nginx;
     "gnulag.net" = {
       extraDomainNames = [ "*.gnulag.net" ];
     };
-    "linuxmasterrace.org" = {
-      extraDomainNames = [ "*.linuxmasterrace.org" ];
-    };
+    # "linuxmasterrace.org" = {
+    #   extraDomainNames = [ "*.linuxmasterrace.org" ];
+    # };
   };
 
   services.nginx = {
@@ -52,8 +56,8 @@ with self.lib.nginx;
       "s3.vapor.systems" = (proxyDomain "vapor.systems" "http://127.0.0.1:3900/");
       "web.vapor.systems" = (proxyDomain "vapor.systems" "http://127.0.0.1:3902/");
       "gnulag.net" = (proxyDomain "gnulag.net" "http://127.0.0.1:3902/");
-      "linuxmasterrace.org" = (proxyDomain "linuxmasterrace.org" "http://127.0.0.1:3902/");
-      "dash.linuxmasterrace.org" = (proxyDomain "linuxmasterrace.org" "http://127.0.0.1:3902/");
+      # "linuxmasterrace.org" = (proxyDomain "linuxmasterrace.org" "http://127.0.0.1:3902/");
+      # "dash.linuxmasterrace.org" = (proxyDomain "linuxmasterrace.org" "http://127.0.0.1:3902/");
     };
   };
 }
-- 
cgit v1.2.3