From 3e7d633dc6e9184b701b1ff918d676b7c39aa675 Mon Sep 17 00:00:00 2001 From: Till Date: Tue, 14 Oct 2025 16:52:21 +0200 Subject: [PATCH] fixes --- flake.nix | 1 + system/web-server/ksh-map.nix | 10 ++++++++-- system/web-server/mail/postfix.nix | 14 +++++++------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index 904e4c1..ce46df5 100644 --- a/flake.nix +++ b/flake.nix @@ -81,6 +81,7 @@ ./system/web-server/mail ./system/web-server/oopsidentify.nix ./system/web-server/fundkorb-button.nix + ./system/web-server/ksh-map.nix ]; }; diff --git a/system/web-server/ksh-map.nix b/system/web-server/ksh-map.nix index a0b9e73..51414cb 100644 --- a/system/web-server/ksh-map.nix +++ b/system/web-server/ksh-map.nix @@ -1,9 +1,15 @@ { config, pkgs, ... }: { + security.acme.certs."${config.networking.domain}".extraDomainNames = [ "kshmap.ktiu.net" ]; + services.nginx.virtualHosts."kshmap.ktiu.net" = { - forceSSL = true; - enableACME = true; + + # forceSSL = true; + # enableACME = true; + + onlySSL = true; + useACMEHost = config.networking.domain; root = "/var/www/ksh-map/dist"; }; } diff --git a/system/web-server/mail/postfix.nix b/system/web-server/mail/postfix.nix index e5a1130..ae3362f 100644 --- a/system/web-server/mail/postfix.nix +++ b/system/web-server/mail/postfix.nix @@ -2,13 +2,13 @@ let - submissionheadercleanuprules = pkgs.writetext "submission_header_cleanup_rules" '' - /^received:/ ignore - /^x-originating-ip:/ ignore - /^x-mailer:/ ignore - /^user-agent:/ ignore - /^x-enigmail:/ ignore - /^message-id:\s+<(.*?)@.*?>/ replace message-id: <$1@ktiu.net> + submissionHeaderCleanupRules = pkgs.writeText "submission_header_cleanup_rules" '' + /^Received:/ ignore + /^X-Originating-IP:/ ignore + /^X-Mailer:/ ignore + /^User-Agent:/ ignore + /^X-Enigmail:/ ignore + /^Message-ID:\s+<(.*?)@.*?>/ replace Message-ID: <$1@ktiu.net> ''; in {