From 364a5c8076c863a7b1a20b704552475f8a249422 Mon Sep 17 00:00:00 2001 From: Alexander Tomokhov Date: Sun, 26 Nov 2023 09:10:09 +0400 Subject: [PATCH] mailserver: adapt to deprecated and new types of certificateScheme --- sp-modules/simple-nixos-mailserver/config.nix | 8 ++++++-- sp-modules/simple-nixos-mailserver/flake.nix | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sp-modules/simple-nixos-mailserver/config.nix b/sp-modules/simple-nixos-mailserver/config.nix index 8cc3364..2fed999 100644 --- a/sp-modules/simple-nixos-mailserver/config.nix +++ b/sp-modules/simple-nixos-mailserver/config.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +mailserverDate: { config, lib, ... }: let sp = config.selfprivacy; in @@ -62,7 +62,11 @@ in "admin@${sp.domain}" = "${sp.username}@${sp.domain}"; }; - certificateScheme = "manual"; + certificateScheme = + if builtins.compareVersions mailserverDate "20230525011002" + >= 0 + then "manual" + else 1; certificateFile = "/var/lib/acme/${sp.domain}/fullchain.pem"; keyFile = "/var/lib/acme/${sp.domain}/key.pem"; diff --git a/sp-modules/simple-nixos-mailserver/flake.nix b/sp-modules/simple-nixos-mailserver/flake.nix index 13aad14..f37594f 100644 --- a/sp-modules/simple-nixos-mailserver/flake.nix +++ b/sp-modules/simple-nixos-mailserver/flake.nix @@ -6,7 +6,6 @@ outputs = { self, mailserver }: { nixosModules.default = args@{ config, ... }: - # tricks to rename (alias) the original module let module = mailserver.nixosModules.default args; in @@ -14,12 +13,13 @@ imports = [ module { + # tricks to rename (alias) the original module config.mailserver = config.selfprivacy.modules.simple-nixos-mailserver; options.selfprivacy.modules.simple-nixos-mailserver = module.options.mailserver; } - ./config.nix + (import ./config.nix mailserver.lastModifiedDate) ]; }; configPathsNeeded =