diff --git a/hosts/default.nix b/hosts/default.nix index 239f702..3268e99 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -23,6 +23,9 @@ let customOverlays ]; config.allowUnfree = true; + config.permittedInsecurePackages = [ + "mbedtls-2.28.10" # Required by shadowsocks-libev + ]; }; # Helper function to create a Proxmox LXC host diff --git a/modules/monitoring/grafana.nix b/modules/monitoring/grafana.nix index f81349a..1952505 100644 --- a/modules/monitoring/grafana.nix +++ b/modules/monitoring/grafana.nix @@ -132,8 +132,8 @@ in grafana-image-renderer = { enable = true; + settings.browser.path = lib.getExe pkgs.ungoogled-chromium; provisionGrafana = true; - chromium = pkgs.ungoogled-chromium; }; postgresql = { diff --git a/modules/services/n8n.nix b/modules/services/n8n.nix index c78fd31..7cb35dc 100644 --- a/modules/services/n8n.nix +++ b/modules/services/n8n.nix @@ -71,7 +71,7 @@ in (lib.mkIf cfg.proxy.enable { services.caddy = with cfg.proxy; { virtualHosts."${subdomain}.${domain}".extraConfig = '' - reverse_proxy http://${host}:${services.n8n.environment.N8N_PORT} + reverse_proxy http://${host}:${config.services.n8n.environment.N8N_PORT} import cloudflare_${domain} ''; diff --git a/modules/services/nextcloud.nix b/modules/services/nextcloud.nix index c1fdec2..7fc7318 100644 --- a/modules/services/nextcloud.nix +++ b/modules/services/nextcloud.nix @@ -76,8 +76,7 @@ in package = pkgs.nextcloud32; hostName = "cloud.${cfg.proxy.domain}"; https = true; - nginx.recommendedHttpHeaders = true; - + secretFile = cfg.secretFile; settings = { @@ -92,7 +91,7 @@ in mail_domain = cfg.proxy.domain; mail_smtphost = "smtp.tem.scaleway.com"; mail_smtpport = 465; - mail_smtpauth = "true"; + mail_smtpauth = true; enabledPreviewProviders = [ "OC\\Preview\\BMP" "OC\\Preview\\GIF"