From 6d4640a018e7043912bbc7cde1d4c02464e81296 Mon Sep 17 00:00:00 2001 From: Till Date: Tue, 15 Apr 2025 15:03:45 +0200 Subject: [PATCH] flaky stuff --- flake.nix | 4 +++- system/web-server/default.nix | 1 - system/web-server/mail.nix | 22 ++++++++++++++++++++++ system/web-server/outline.nix | 11 +++++++---- 4 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 system/web-server/mail.nix diff --git a/flake.nix b/flake.nix index 84254a8..e02af5f 100644 --- a/flake.nix +++ b/flake.nix @@ -66,14 +66,16 @@ modules = [ { networking.hostName = "arielle"; + networking.domain = "ktiu.net"; boot.loader.grub.enable = true; boot.loader.grub.device = "/dev/sda"; } + ./system/hardware/arielle.nix ./system ./system/web-server ./system/web-server/outline.nix ./system/web-server/jenkins.nix - ./system/hardware/arielle.nix + ./system/web-server/mail.nix ]; }; diff --git a/system/web-server/default.nix b/system/web-server/default.nix index dc4a0fa..e33da09 100644 --- a/system/web-server/default.nix +++ b/system/web-server/default.nix @@ -5,7 +5,6 @@ networking.firewall.allowedTCPPorts = [ 80 443 ]; - services.jenkins.enable = true; services.nginx = { enable = true; diff --git a/system/web-server/mail.nix b/system/web-server/mail.nix new file mode 100644 index 0000000..a2bd09a --- /dev/null +++ b/system/web-server/mail.nix @@ -0,0 +1,22 @@ +{ config, pkgs, ... }: + +{ + + services.postfix = { + enable = true; + domain = "ktiu.net"; + virtual = [ + "@ktiu.net till" + "till till" + "uni@ktiu.net straube@geo.uni-frankfurt.de" + "meetup@ktiu.net straube@geo.uni-frankfurt.de" + ]; + }; + + services.opendkim = { + enable = true; + domains = "csl:ktiu.net"; + selector = "202412"; + }; + +} diff --git a/system/web-server/outline.nix b/system/web-server/outline.nix index b6173ca..e675119 100644 --- a/system/web-server/outline.nix +++ b/system/web-server/outline.nix @@ -2,10 +2,13 @@ { - services.outline = { - enable = true; - storage.storageType = "local"; - }; + # services.outline = { + # enable = true; + # storage.storageType = "local"; + # smtp = { + # host = "localhost"; + # }; + # }; services.nginx.virtualHosts."outline.ktiu.net" = { addSSL = true;