Unverified Commit 4dc624f9 authored by Lin Jian's avatar Lin Jian Committed by GitHub
Browse files

Merge pull request #255264 from emilylange/nixos/caddy 

nixos/caddy: ensure vhosts come after user-specified `cfg.extraConfig`
parents 2de69504 fcdcccae

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

+1 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ let 
            ${cfg.globalConfig}

          }

          ${cfg.extraConfig}

          ${concatMapStringsSep "\n" mkVHostConf virtualHosts}

        '';



        Caddyfile-formatted = pkgs.runCommand "Caddyfile-formatted" { nativeBuildInputs = [ cfg.package ]; } ''
@@ -340,7 +341,6 @@ in 
      groups = config.users.groups;

    }) acmeHosts;



    services.caddy.extraConfig = concatMapStringsSep "\n" mkVHostConf virtualHosts;

    services.caddy.globalConfig = ''

      ${optionalString (cfg.email != null) "email ${cfg.email}"}

      ${optionalString (cfg.acmeCA != null) "acme_ca ${cfg.acmeCA}"}