From 3546e59acc79b81c673947ae859ec64f68c6c7a6 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 27 Mar 2025 20:25:54 +0100 Subject: [PATCH] Revert "nixos/caddy: validate at build-time" This reverts commit 63b6df42de91b5a4bf53c7e9da924cc8d3a39e91. --- .../services/web-servers/caddy/default.nix | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix index 3bc82c5ed875..9518e145c8c4 100644 --- a/nixos/modules/services/web-servers/caddy/default.nix +++ b/nixos/modules/services/web-servers/caddy/default.nix @@ -45,23 +45,7 @@ let settingsFormat.generate "caddy.json" cfg.settings else let - 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 '' + Caddyfile = pkgs.writeTextDir "Caddyfile" '' { ${cfg.globalConfig} }