movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

nixos/caddy: validate at build-time (#377075)

Browse source
This commit is contained in:
Felix Bühler 2025-03-25 22:53:00 +01:00 • committed by GitHub
commit fb0fb09b5c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

32
nixos/modules/services/web-servers/caddy/default.nix
View file

@ -45,7 +45,23 @@ let
settingsFormat.generate "caddy.json" cfg.settings settingsFormat.generate "caddy.json" cfg.settings
else else
let 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} ${cfg.globalConfig}
} }
@ -53,13 +69,11 @@ let
${concatMapStringsSep "\n" mkVHostConf virtualHosts} ${concatMapStringsSep "\n" mkVHostConf virtualHosts}
''; '';
Caddyfile-formatted = Caddyfile-formatted = pkgs.runCommand "Caddyfile-formatted" { } ''
pkgs.runCommand "Caddyfile-formatted" { nativeBuildInputs = [ cfg.package ]; } mkdir -p $out
'' cp --no-preserve=mode ${Caddyfile}/Caddyfile $out/Caddyfile
mkdir -p $out ${lib.getExe cfg.package} fmt --overwrite $out/Caddyfile
cp --no-preserve=mode ${Caddyfile}/Caddyfile $out/Caddyfile '';
caddy fmt --overwrite $out/Caddyfile
'';
in in
"${ "${
if pkgs.stdenv.buildPlatform == pkgs.stdenv.hostPlatform then Caddyfile-formatted else Caddyfile if pkgs.stdenv.buildPlatform == pkgs.stdenv.hostPlatform then Caddyfile-formatted else Caddyfile
@ -437,7 +451,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. # 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 = [ 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 # Validating the configuration before applying it ensures we’ll get a proper error that will be reported when switching to the configuration
ExecReload = [ ExecReload = [