commit f5a06f7150d534ab3a849ca500164b9707e1bb69 · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

nixos/caddy: fix `caddy fmt` for caddy v2.6.3

The nixos module uses `caddy fmt` to *format* the generated Caddyfile.
v2.6.3 slightly altered `caddy fmt`'s behavior.

Excerpt from https://github.com/caddyserver/caddy/releases/tag/v2.6.3
> cmd: caddy fmt return code is 1 if not formatted
> cmd: fmt exit successfully after overwriting config file

Which is why the internal `Caddyfile-formatted` now uses `cp` and `caddy fmt --overwrite` instead

IndeedNotJames 2 years ago f5a06f71 f446d272

options

unified split

Changed files

+2 -1

nixos

modules

services

web-servers

caddy

default.nix

+2 -1

nixos/modules/services/web-servers/caddy/default.nix

···

       35
       35
        
       

     

       36
       36
        
             Caddyfile-formatted = pkgs.runCommand "Caddyfile-formatted" { nativeBuildInputs = [ cfg.package ]; } ''

     

       37
       37
        
               mkdir -p $out

     

       38
       38
       -
               ${cfg.package}/bin/caddy fmt ${Caddyfile}/Caddyfile > $out/Caddyfile

     

       38
       38
       +
               cp --no-preserve=mode ${Caddyfile}/Caddyfile $out/Caddyfile

     

       39
       39
       +
               caddy fmt --overwrite $out/Caddyfile

     

       39
       40
        
             '';

     

       40
       41
        
           in

     

       41
       42
        
             "${if pkgs.stdenv.buildPlatform == pkgs.stdenv.hostPlatform then Caddyfile-formatted else Caddyfile}/Caddyfile";