diff options
| author | Lin Jian <me@linj.tech> | 2023-09-18 19:34:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-18 19:34:34 +0800 |
| commit | 4dc624f9c7d970f9b6fc9469f4873d7c9e14142b (patch) | |
| tree | 816d3cc8acb9198427061ffb055c3a7d76855984 /nixos | |
| parent | 2de6950437b49cff820135c76ee39061359cdf69 (diff) | |
| parent | fcdcccaed6748dc53a748a170125158262510d2b (diff) | |
Merge pull request #255264 from emilylange/nixos/caddy
nixos/caddy: ensure vhosts come after user-specified `cfg.extraConfig`
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/web-servers/caddy/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix index cec0b379f67ae..ce74e243a1818 100644 --- a/nixos/modules/services/web-servers/caddy/default.nix +++ b/nixos/modules/services/web-servers/caddy/default.nix @@ -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}"} |