diff --git a/hosts/mail/default.nix b/hosts/mail/default.nix index 672a187..93771a8 100644 --- a/hosts/mail/default.nix +++ b/hosts/mail/default.nix @@ -30,12 +30,6 @@ services.openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password"; - security.acme.defaults = { - email = "hostmaster@vimium.com"; - group = "nginx"; - webroot = "/var/lib/acme/acme-challenge"; - }; - modules = { services = { borgmatic = { diff --git a/hosts/server.nix b/hosts/server.nix index 7be6572..23eb269 100644 --- a/hosts/server.nix +++ b/hosts/server.nix @@ -10,7 +10,14 @@ fonts.fontconfig.enable = false; security = { - acme.acceptTerms = true; + acme = { + acceptTerms = true; + defaults = { + email = "hostmaster@vimium.com"; + group = "nginx"; + webroot = "/var/lib/acme/acme-challenge"; + }; + }; auditd.enable = true; audit = { enable = true; diff --git a/hosts/vps1/default.nix b/hosts/vps1/default.nix index 8fc9ebb..a0aebe1 100644 --- a/hosts/vps1/default.nix +++ b/hosts/vps1/default.nix @@ -40,12 +40,6 @@ services.openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password"; - security.acme.defaults = { - email = "hostmaster@vimium.com"; - group = "nginx"; - webroot = "/var/lib/acme/acme-challenge"; - }; - modules = { services = { borgmatic = {