diff options
| author | Florian Klink <flokli@flokli.de> | 2023-12-10 15:22:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-10 15:22:36 +0200 |
| commit | 1a2090c53da6a56235cedb1ff8a4b8f0f27467e9 (patch) | |
| tree | 9bbcac566d209476b8739fca9219ffef716cb801 /nixos/modules | |
| parent | 77b82f915139bfb64685c7a91c9cb6ecf450f3c0 (diff) | |
| parent | 70c3cde53b9e7ac85a4cb46032f661dfc5fb8adc (diff) | |
Merge pull request #272617 from NixOS/backport-272542-to-release-23.11
[Backport release-23.11] nixos/caddy: use caddyfile adapter by default with explicit configFile
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/web-servers/caddy/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix index cc89553fbb756..d50d8e34d50b4 100644 --- a/nixos/modules/services/web-servers/caddy/default.nix +++ b/nixos/modules/services/web-servers/caddy/default.nix @@ -154,7 +154,7 @@ in default = configFile; defaultText = "A Caddyfile automatically generated by values from services.caddy.*"; example = literalExpression '' - pkgs.writeTextDir "Caddyfile" ''' + pkgs.writeText "Caddyfile" ''' example.com root * /var/www/wordpress @@ -171,9 +171,9 @@ in }; adapter = mkOption { - default = if (builtins.baseNameOf cfg.configFile) == "Caddyfile" then "caddyfile" else null; + default = if ((cfg.configFile != configFile) || (builtins.baseNameOf cfg.configFile) == "Caddyfile") then "caddyfile" else null; defaultText = literalExpression '' - if (builtins.baseNameOf cfg.configFile) == "Caddyfile" then "caddyfile" else null + if ((cfg.configFile != configFile) || (builtins.baseNameOf cfg.configFile) == "Caddyfile") then "caddyfile" else null ''; example = literalExpression "nginx"; type = with types; nullOr str; |