diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-03-25 11:57:48 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-03 16:25:07 +0200 |
commit | 5400b9b6f65451d41a9106fae6fc00f97d83f4ef (patch) | |
tree | 6ed072da7b1f17ac3994ffea052aa0c0822f8446 /modules/private/mail | |
parent | 441da8aac378f401625e82caf281fa0e26128310 (diff) | |
download | Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.tar.gz Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.tar.zst Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.zip |
Upgrade nixos
Diffstat (limited to 'modules/private/mail')
-rw-r--r-- | modules/private/mail/default.nix | 2 | ||||
-rw-r--r-- | modules/private/mail/dovecot.nix | 2 | ||||
-rw-r--r-- | modules/private/mail/postfix.nix | 2 | ||||
-rw-r--r-- | modules/private/mail/relay.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/modules/private/mail/default.nix b/modules/private/mail/default.nix index 1c64e15..b50e346 100644 --- a/modules/private/mail/default.nix +++ b/modules/private/mail/default.nix | |||
@@ -13,7 +13,7 @@ | |||
13 | options.myServices.mailBackup.enable = lib.mkEnableOption "enable MX backup services"; | 13 | options.myServices.mailBackup.enable = lib.mkEnableOption "enable MX backup services"; |
14 | 14 | ||
15 | config = lib.mkIf config.myServices.mail.enable { | 15 | config = lib.mkIf config.myServices.mail.enable { |
16 | security.acme2.certs."mail" = config.myServices.certificates.certConfig // { | 16 | security.acme.certs."mail" = config.myServices.certificates.certConfig // { |
17 | domain = config.hostEnv.fqdn; | 17 | domain = config.hostEnv.fqdn; |
18 | extraDomains = let | 18 | extraDomains = let |
19 | zonesWithMx = builtins.filter (zone: | 19 | zonesWithMx = builtins.filter (zone: |
diff --git a/modules/private/mail/dovecot.nix b/modules/private/mail/dovecot.nix index 9836f78..77f9bd7 100644 --- a/modules/private/mail/dovecot.nix +++ b/modules/private/mail/dovecot.nix | |||
@@ -269,7 +269,7 @@ in | |||
269 | [ | 269 | [ |
270 | "0 2 * * * root ${cron_script}/bin/cleanup-imap-folders" | 270 | "0 2 * * * root ${cron_script}/bin/cleanup-imap-folders" |
271 | ]; | 271 | ]; |
272 | security.acme2.certs."mail" = { | 272 | security.acme.certs."mail" = { |
273 | postRun = '' | 273 | postRun = '' |
274 | systemctl restart dovecot2.service | 274 | systemctl restart dovecot2.service |
275 | ''; | 275 | ''; |
diff --git a/modules/private/mail/postfix.nix b/modules/private/mail/postfix.nix index e0347ec..4791b41 100644 --- a/modules/private/mail/postfix.nix +++ b/modules/private/mail/postfix.nix | |||
@@ -428,7 +428,7 @@ | |||
428 | }; | 428 | }; |
429 | }; | 429 | }; |
430 | }; | 430 | }; |
431 | security.acme2.certs."mail" = { | 431 | security.acme.certs."mail" = { |
432 | postRun = '' | 432 | postRun = '' |
433 | systemctl restart postfix.service | 433 | systemctl restart postfix.service |
434 | ''; | 434 | ''; |
diff --git a/modules/private/mail/relay.nix b/modules/private/mail/relay.nix index 18d6bc3..c6231aa 100644 --- a/modules/private/mail/relay.nix +++ b/modules/private/mail/relay.nix | |||
@@ -1,7 +1,7 @@ | |||
1 | { lib, pkgs, config, nodes, name, ... }: | 1 | { lib, pkgs, config, nodes, name, ... }: |
2 | { | 2 | { |
3 | config = lib.mkIf config.myServices.mailBackup.enable { | 3 | config = lib.mkIf config.myServices.mailBackup.enable { |
4 | security.acme2.certs."mail" = config.myServices.certificates.certConfig // { | 4 | security.acme.certs."mail" = config.myServices.certificates.certConfig // { |
5 | postRun = '' | 5 | postRun = '' |
6 | systemctl restart postfix.service | 6 | systemctl restart postfix.service |
7 | ''; | 7 | ''; |