From 69d03945f1027df7fc8d9d27a8be9d71712584f0 Mon Sep 17 00:00:00 2001
From: V <v@unfathomable.blue>
Date: Thu, 2 Jun 2022 18:44:20 +0200
Subject: fleet: upgrade to NixOS 22.05

Change-Id: Ie5542d079ee7b2de06e0faed52343905b3287b39
---
 fleet/hosts/kaikou/default.nix       | 2 +-
 fleet/hosts/kaikou/gerrit.nix        | 2 +-
 fleet/hosts/trieste/cgit/default.nix | 4 ++--
 fleet/hosts/trieste/default.nix      | 2 +-
 fleet/hosts/trieste/lists.nix        | 2 +-
 fleet/hosts/trieste/web.nix          | 2 +-
 fleet/hosts/vityaz/default.nix       | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'fleet/hosts')

diff --git a/fleet/hosts/kaikou/default.nix b/fleet/hosts/kaikou/default.nix
index fcb22db..6fe132b 100644
--- a/fleet/hosts/kaikou/default.nix
+++ b/fleet/hosts/kaikou/default.nix
@@ -29,7 +29,7 @@ with lib;
     prefixLength = 64;
   };
 
-  services.caddy.config = ''
+  services.caddy.extraConfig = ''
     kaikou.unfathomable.blue {
       import common
       redir / https://en.wikipedia.org/wiki/Kaik%C5%8D_ROV
diff --git a/fleet/hosts/kaikou/gerrit.nix b/fleet/hosts/kaikou/gerrit.nix
index f97ba23..5308ad4 100644
--- a/fleet/hosts/kaikou/gerrit.nix
+++ b/fleet/hosts/kaikou/gerrit.nix
@@ -32,7 +32,7 @@
     };
   };
 
-  services.caddy.config = ''
+  services.caddy.extraConfig = ''
     review.unfathomable.blue {
       import common
       reverse_proxy localhost:8080
diff --git a/fleet/hosts/trieste/cgit/default.nix b/fleet/hosts/trieste/cgit/default.nix
index 880842b..17f3e4f 100644
--- a/fleet/hosts/trieste/cgit/default.nix
+++ b/fleet/hosts/trieste/cgit/default.nix
@@ -21,7 +21,7 @@ let
     '';
     passAsFile = [ "extraStyles" ];
   } ''
-    ${pkgs.minify}/bin/minify --type css ${pkgs.cgit}/cgit/cgit.css $extraStylesPath -o $out/cgit.css
+    ${pkgs.minify}/bin/minify --type css --bundle ${pkgs.cgit}/cgit/cgit.css $extraStylesPath -o $out/cgit.css
     cp ${./un.svg} $out/un.svg  # TODO(V): remove this variant, apply padding to the Sigil using CSS
     cp ${./unicon.svg} $out/unicon.svg  # This is the same as un.svg, but without any padding
     cp ${./ripple.svg} $out/ripple.svg  # This is referenced in git.nix (as config.cgit.logo, for Ripple)
@@ -75,7 +75,7 @@ in {
   };
 
   # TODO(V): set up git-http-backend. Disable enable-http-clone when we've done that?
-  services.caddy.config = ''
+  services.caddy.extraConfig = ''
     src.unfathomable.blue {
       import common
 
diff --git a/fleet/hosts/trieste/default.nix b/fleet/hosts/trieste/default.nix
index 1ca50ac..97dfbd0 100644
--- a/fleet/hosts/trieste/default.nix
+++ b/fleet/hosts/trieste/default.nix
@@ -39,7 +39,7 @@ with lib;
     prefixLength = 64;
   };
 
-  services.caddy.config = ''
+  services.caddy.extraConfig = ''
     trieste.unfathomable.blue {
       import common
       redir / https://en.wikipedia.org/wiki/Trieste_(bathyscaphe)
diff --git a/fleet/hosts/trieste/lists.nix b/fleet/hosts/trieste/lists.nix
index a4e9a69..87c46d9 100644
--- a/fleet/hosts/trieste/lists.nix
+++ b/fleet/hosts/trieste/lists.nix
@@ -49,7 +49,7 @@ with lib;
   # By default, the index 404s with the rather confusing message "no inboxes, yet", even when there are inboxes configured.
   services.public-inbox.settings.publicinbox.wwwlisting = "all";
 
-  services.caddy.config = ''
+  services.caddy.extraConfig = ''
     lists.unfathomable.blue {
       import common
       reverse_proxy unix//run/public-inbox/httpd.sock
diff --git a/fleet/hosts/trieste/web.nix b/fleet/hosts/trieste/web.nix
index d32fc44..9b7752b 100644
--- a/fleet/hosts/trieste/web.nix
+++ b/fleet/hosts/trieste/web.nix
@@ -16,7 +16,7 @@
     '')
   ];
 
-  services.caddy.config = ''
+  services.caddy.extraConfig = ''
     unfathomable.blue {
       import common
       respond / "the depths await"
diff --git a/fleet/hosts/vityaz/default.nix b/fleet/hosts/vityaz/default.nix
index 8508518..bd7af5f 100644
--- a/fleet/hosts/vityaz/default.nix
+++ b/fleet/hosts/vityaz/default.nix
@@ -71,7 +71,7 @@ with lib;
 
   boot.kernel.sysctl."net.ipv4.conf.wg0.forwarding" = true;
 
-  services.caddy.config = ''
+  services.caddy.extraConfig = ''
     vityaz.unfathomable.blue {
       import common
       redir / https://en.wikipedia.org/wiki/Vityaz-D_Autonomous_Underwater_Vehicle
-- 
cgit 1.4.1