From d700cbe1826a3836008f90bee5ceb6f2983a5c43 Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@leastauthority.com>
Date: Thu, 23 Jan 2025 20:52:14 +0000
Subject: [PATCH 1/4] Keep fewer logs around

Refs #17
---
 testgrid.tahoe-lafs.org/system-configuration.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/testgrid.tahoe-lafs.org/system-configuration.nix b/testgrid.tahoe-lafs.org/system-configuration.nix
index c58f55e..5304209 100644
--- a/testgrid.tahoe-lafs.org/system-configuration.nix
+++ b/testgrid.tahoe-lafs.org/system-configuration.nix
@@ -40,6 +40,15 @@
       git
     ];
 
+  # Keep log file disk usage in check.
+  # The default is 10% of the partitition size or so.
+  services.journald.extraConfig = ''
+    # One week of logs ought to be enough
+    MaxRetentionSec=${7 * (24 * 60 * 60)};
+    MaxFileSec=1day
+    SystemMaxUse=250M
+  '';
+
   # Make sure the firewall is enabled.  This is probably the default but let's
   # be explicit and safe.
   networking.firewall.enable = true;

From 03d2cfa46636ab8c703a63d82b4da46c00a386f7 Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@leastauthority.com>
Date: Thu, 23 Jan 2025 20:57:00 +0000
Subject: [PATCH 2/4] Fix nix syntax

---
 testgrid.tahoe-lafs.org/system-configuration.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testgrid.tahoe-lafs.org/system-configuration.nix b/testgrid.tahoe-lafs.org/system-configuration.nix
index 5304209..98f2994 100644
--- a/testgrid.tahoe-lafs.org/system-configuration.nix
+++ b/testgrid.tahoe-lafs.org/system-configuration.nix
@@ -44,7 +44,7 @@
   # The default is 10% of the partitition size or so.
   services.journald.extraConfig = ''
     # One week of logs ought to be enough
-    MaxRetentionSec=${7 * (24 * 60 * 60)};
+    MaxRetentionSec=${toString(7 * (24 * 60 * 60))}s;
     MaxFileSec=1day
     SystemMaxUse=250M
   '';

From db15f3677dd6591ac1fb7bbcb34fc10c01542f74 Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@leastauthority.com>
Date: Thu, 23 Jan 2025 20:58:45 +0000
Subject: [PATCH 3/4] braino

---
 testgrid.tahoe-lafs.org/system-configuration.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testgrid.tahoe-lafs.org/system-configuration.nix b/testgrid.tahoe-lafs.org/system-configuration.nix
index 98f2994..d14c424 100644
--- a/testgrid.tahoe-lafs.org/system-configuration.nix
+++ b/testgrid.tahoe-lafs.org/system-configuration.nix
@@ -44,7 +44,7 @@
   # The default is 10% of the partitition size or so.
   services.journald.extraConfig = ''
     # One week of logs ought to be enough
-    MaxRetentionSec=${toString(7 * (24 * 60 * 60))}s;
+    MaxRetentionSec=${toString(7 * (24 * 60 * 60))}s
     MaxFileSec=1day
     SystemMaxUse=250M
   '';

From fa9c99fc65787c604ff1e218fbb4dc22fbe79bdf Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@leastauthority.com>
Date: Mon, 17 Feb 2025 15:02:38 +0000
Subject: [PATCH 4/4] Be more explicit regarding what version of Tahoe-LAFS
 we're running.

---
 testgrid.tahoe-lafs.org/tahoe-lafs-testgrid.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testgrid.tahoe-lafs.org/tahoe-lafs-testgrid.nix b/testgrid.tahoe-lafs.org/tahoe-lafs-testgrid.nix
index 684775e..99fb6a5 100644
--- a/testgrid.tahoe-lafs.org/tahoe-lafs-testgrid.nix
+++ b/testgrid.tahoe-lafs.org/tahoe-lafs-testgrid.nix
@@ -9,7 +9,7 @@ let
   #   package = pkgs.tahoe-lafs;
   # The upstream flake:
   package = (builtins.getFlake
-    "github:tahoe-lafs/tahoe-lafs/f45175569e870ccd8a25bd9903ea109eaf25075d").packages.x86_64-linux.default;
+    "github:tahoe-lafs/tahoe-lafs?ref=master").packages.x86_64-linux.default;
 in {
   # Configure Tahoe to run here.
   services.tahoe = {