From 343c7fcc36b78badfa7f9910bfa101124c0fb990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= Date: Mon, 17 May 2021 00:02:03 +0100 Subject: [PATCH] nginx: Don't override extra options in the host helper --- configuration/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configuration/default.nix b/configuration/default.nix index 49668dd..a12aceb 100644 --- a/configuration/default.nix +++ b/configuration/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { imports = [ @@ -58,11 +58,11 @@ virtualHosts = let host = port: extra: - { + lib.recursiveUpdate { forceSSL = true; enableACME = true; locations."/" = { proxyPass = "http://127.0.0.1:${toString port}"; }; - } // extra; + } extra; domain = config.services.nginx.domain; in { "${domain}" = host 3002 { serverAliases = [ "www.${domain}" ]; };