From a155538eb9020f82b19a90d93e0052d18d4fb087 Mon Sep 17 00:00:00 2001 From: Astro Date: Sat, 8 Jan 2022 18:23:33 +0100 Subject: [PATCH] lib/default.nix: quelch security.acme.email warning on NixOS>21.05 --- lib/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index 1da4b504..16fad0ea 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -2,7 +2,7 @@ # That includes physical servers, VMs, containers, and personal machines. # -{ config, lib, pkgs, ... }: +{ config, options, lib, pkgs, ... }: let hqPrefix64 = "fd23:42:c3d2:523"; @@ -336,10 +336,18 @@ in { }; # Defaults for LetsEncrypt - security.acme = { - acceptTerms = true; - email = cfg.acmeEmail; - }; + security.acme = + if options.security.acme ? defaults + then { + acceptTerms = true; + # NixOS>=22.05 + defaults.email = cfg.acmeEmail; + } + else { + acceptTerms = true; + # TODO: NixOS<=21.05 + email = cfg.acmeEmail; + }; }; meta.maintainers = with lib.maintainers; [ ehmry ];