diff options
| author | sohalt <sohalt@sohalt.net> | 2023-12-06 21:34:38 +0100 |
|---|---|---|
| committer | sohalt <sohalt@sohalt.net> | 2023-12-06 21:57:21 +0100 |
| commit | 3c6b3d71fa696da5c170c0ff44eaa8c51999a80c (patch) | |
| tree | 2ed4f7308f952f9f0c99d30f6340da2b9459a5a9 /nixos/modules/services/web-servers | |
| parent | ea5566eb3b278d405c7f2ecddae033ed2280ec8f (diff) | |
| download | nixlib-3c6b3d71fa696da5c170c0ff44eaa8c51999a80c.tar nixlib-3c6b3d71fa696da5c170c0ff44eaa8c51999a80c.tar.gz nixlib-3c6b3d71fa696da5c170c0ff44eaa8c51999a80c.tar.bz2 nixlib-3c6b3d71fa696da5c170c0ff44eaa8c51999a80c.tar.lz nixlib-3c6b3d71fa696da5c170c0ff44eaa8c51999a80c.tar.xz nixlib-3c6b3d71fa696da5c170c0ff44eaa8c51999a80c.tar.zst nixlib-3c6b3d71fa696da5c170c0ff44eaa8c51999a80c.zip | |
nixos/caddy: Use caddyfile adapter by default when explicitly specifying configFile
Diffstat (limited to 'nixos/modules/services/web-servers')
| -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 497aa9ba956e..9a544e98cfc4 100644 --- a/nixos/modules/services/web-servers/caddy/default.nix +++ b/nixos/modules/services/web-servers/caddy/default.nix @@ -147,7 +147,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 @@ -164,9 +164,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; |