From 1ef1bcec0982e03328ced1f8508b890af8232519 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 3 Mar 2025 21:24:30 +0100
Subject: [PATCH 1/2] nixos/caddy: use lib.getExe

---
 .../modules/services/web-servers/caddy/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix
index d87a04e0f5f1..9518e145c8c4 100644
--- a/nixos/modules/services/web-servers/caddy/default.nix
+++ b/nixos/modules/services/web-servers/caddy/default.nix
@@ -53,13 +53,11 @@ let
           ${concatMapStringsSep "\n" mkVHostConf virtualHosts}
         '';
 
-        Caddyfile-formatted =
-          pkgs.runCommand "Caddyfile-formatted" { nativeBuildInputs = [ cfg.package ]; }
-            ''
-              mkdir -p $out
-              cp --no-preserve=mode ${Caddyfile}/Caddyfile $out/Caddyfile
-              caddy fmt --overwrite $out/Caddyfile
-            '';
+        Caddyfile-formatted = pkgs.runCommand "Caddyfile-formatted" { } ''
+          mkdir -p $out
+          cp --no-preserve=mode ${Caddyfile}/Caddyfile $out/Caddyfile
+          ${lib.getExe cfg.package} fmt --overwrite $out/Caddyfile
+        '';
       in
       "${
         if pkgs.stdenv.buildPlatform == pkgs.stdenv.hostPlatform then Caddyfile-formatted else Caddyfile
@@ -437,7 +435,7 @@ in
           # If the empty string is assigned to this option, the list of commands to start is reset, prior assignments of this option will have no effect.
           ExecStart = [
             ""
-            ''${cfg.package}/bin/caddy run ${runOptions} ${optionalString cfg.resume "--resume"}''
+            ''${lib.getExe cfg.package} run ${runOptions} ${optionalString cfg.resume "--resume"}''
           ];
           # Validating the configuration before applying it ensures we’ll get a proper error that will be reported when switching to the configuration
           ExecReload = [

From 63b6df42de91b5a4bf53c7e9da924cc8d3a39e91 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 27 Jan 2025 23:45:18 +0100
Subject: [PATCH 2/2] nixos/caddy: validate at build-time

---
 .../services/web-servers/caddy/default.nix     | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix
index 9518e145c8c4..3bc82c5ed875 100644
--- a/nixos/modules/services/web-servers/caddy/default.nix
+++ b/nixos/modules/services/web-servers/caddy/default.nix
@@ -45,7 +45,23 @@ let
       settingsFormat.generate "caddy.json" cfg.settings
     else
       let
-        Caddyfile = pkgs.writeTextDir "Caddyfile" ''
+        writeCaddyfile =
+          text:
+          pkgs.runCommandLocal "Caddyfile"
+            {
+              inherit text;
+              passAsFile = [ "text" ];
+            }
+            ''
+              mkdir -p $out
+              cp "$textPath" $out/Caddyfile
+
+              # 'validate' cannot be used for validation, due to log location access
+              # See https://github.com/caddyserver/caddy/issues/6788
+              ${lib.getExe cfg.package} adapt --config $out/Caddyfile
+            '';
+
+        Caddyfile = writeCaddyfile ''
           {
             ${cfg.globalConfig}
           }