From 10a84a0863b188a660a9530c21be3bef630e6312 Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Thu, 12 Aug 2021 18:39:56 +0200 Subject: [PATCH] Move mailserver config to mailserver.nix and remove block that is not needed anymore --- configuration.nix | 6 ++---- mailserver.nix | 8 +------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/configuration.nix b/configuration.nix index 4700fe6..fa7c9ed 100644 --- a/configuration.nix +++ b/configuration.nix @@ -18,10 +18,8 @@ ]; # Configuration options for the mailserver - variables = { - mailAdmin = "postmaster@mail.hamburg.freifunk.net"; - useSSL = true; - }; + # MOVED to mailserver.nix + # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; boot.loader.grub.version = 2; diff --git a/mailserver.nix b/mailserver.nix index 062e146..d74ae0d 100644 --- a/mailserver.nix +++ b/mailserver.nix @@ -20,13 +20,7 @@ in networking.domain = "hamburg.freifunk.net"; services.mymailserver = { enable = true; - adminAddress = "kontakt@hamburg.freifunk.net"; + adminAddress = "postmaster@mail.hamburg.freifunk.net"; mailFQDN = "mail2.hamburg.freifunk.net"; }; - users.groups."${config.variables.vmailGroup}" = { gid = config.variables.vmailGID; }; - users.users."${config.variables.vmailUser}" = { - uid = config.variables.vmailUID; - group = config.variables.vmailGroup; - hashedPassword = "!"; - }; }