From ce0521ef779dae7ced8fb3a45cbb2e81d8a189f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Sat, 20 Jan 2024 14:47:44 +0200 Subject: [PATCH] extraConfig: use mkDefault --- modules/e11sync/default.nix | 3 ++- vm.nix | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/e11sync/default.nix b/modules/e11sync/default.nix index d4f134b..23b2e4f 100644 --- a/modules/e11sync/default.nix +++ b/modules/e11sync/default.nix @@ -82,6 +82,7 @@ in { }; services.caddy.virtualHosts."${cfg.vhost}".extraConfig = - builtins.readFile "${e11sync-caddyfile}"; + lib.mkDefault + (builtins.readFile "${e11sync-caddyfile}"); }; } diff --git a/vm.nix b/vm.nix index 58ecd53..ddb29a4 100644 --- a/vm.nix +++ b/vm.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + lib, + pkgs, + ... +}: { e11sync = { enable = true; migrateOnStart = true; @@ -13,7 +17,7 @@ auto_https off debug ''; - virtualHosts."http://:8003".extraConfig = '' + virtualHosts."http://:8003".extraConfig = lib.mkForce '' redir / /admin/ ${builtins.readFile "${pkgs.e11sync-caddyfile}"} '';