diff options
Diffstat (limited to 'modules/private/mail')
-rw-r--r-- | modules/private/mail/default.nix | 10 | ||||
-rw-r--r-- | modules/private/mail/dovecot.nix | 4 | ||||
-rw-r--r-- | modules/private/mail/postfix.nix | 3 | ||||
-rw-r--r-- | modules/private/mail/rspamd.nix | 3 | ||||
-rw-r--r-- | modules/private/mail/sympa.nix | 3 |
5 files changed, 0 insertions, 23 deletions
diff --git a/modules/private/mail/default.nix b/modules/private/mail/default.nix index fd6d638..2d405c6 100644 --- a/modules/private/mail/default.nix +++ b/modules/private/mail/default.nix | |||
@@ -35,16 +35,6 @@ | |||
35 | mxs = map (zone: "${config.hostEnv.mx.subdomain}.${zone.name}") zonesWithMx; | 35 | mxs = map (zone: "${config.hostEnv.mx.subdomain}.${zone.name}") zonesWithMx; |
36 | in builtins.listToAttrs (map (mx: lib.attrsets.nameValuePair mx null) mxs); | 36 | in builtins.listToAttrs (map (mx: lib.attrsets.nameValuePair mx null) mxs); |
37 | }; | 37 | }; |
38 | services.duplyBackup.profiles = { | ||
39 | mail = { | ||
40 | remotes = [ "eriomem" "ovh" ]; | ||
41 | rootDir = "/var/lib"; | ||
42 | excludeFile = lib.mkAfter '' | ||
43 | + /var/lib/vhost | ||
44 | - /var/lib | ||
45 | ''; | ||
46 | }; | ||
47 | }; | ||
48 | systemd.slices.mail = { | 38 | systemd.slices.mail = { |
49 | description = "Mail slice"; | 39 | description = "Mail slice"; |
50 | }; | 40 | }; |
diff --git a/modules/private/mail/dovecot.nix b/modules/private/mail/dovecot.nix index 0ef3467..b6fdc02 100644 --- a/modules/private/mail/dovecot.nix +++ b/modules/private/mail/dovecot.nix | |||
@@ -14,10 +14,6 @@ in | |||
14 | { | 14 | { |
15 | config = lib.mkIf config.myServices.mail.enable { | 15 | config = lib.mkIf config.myServices.mail.enable { |
16 | systemd.services.dovecot2.serviceConfig.Slice = "mail.slice"; | 16 | systemd.services.dovecot2.serviceConfig.Slice = "mail.slice"; |
17 | services.duplyBackup.profiles.mail.excludeFile = '' | ||
18 | + /var/lib/dhparams | ||
19 | + /var/lib/dovecot | ||
20 | ''; | ||
21 | secrets.keys."dovecot/ldap" = { | 17 | secrets.keys."dovecot/ldap" = { |
22 | user = config.services.dovecot2.user; | 18 | user = config.services.dovecot2.user; |
23 | group = config.services.dovecot2.group; | 19 | group = config.services.dovecot2.group; |
diff --git a/modules/private/mail/postfix.nix b/modules/private/mail/postfix.nix index 054b93e..ae98a8a 100644 --- a/modules/private/mail/postfix.nix +++ b/modules/private/mail/postfix.nix | |||
@@ -1,9 +1,6 @@ | |||
1 | { lib, pkgs, config, nodes, ... }: | 1 | { lib, pkgs, config, nodes, ... }: |
2 | { | 2 | { |
3 | config = lib.mkIf config.myServices.mail.enable { | 3 | config = lib.mkIf config.myServices.mail.enable { |
4 | services.duplyBackup.profiles.mail.excludeFile = '' | ||
5 | + /var/lib/postfix | ||
6 | ''; | ||
7 | secrets.keys = { | 4 | secrets.keys = { |
8 | "postfix/mysql_alias_maps" = { | 5 | "postfix/mysql_alias_maps" = { |
9 | user = config.services.postfix.user; | 6 | user = config.services.postfix.user; |
diff --git a/modules/private/mail/rspamd.nix b/modules/private/mail/rspamd.nix index a20135a..05f1300 100644 --- a/modules/private/mail/rspamd.nix +++ b/modules/private/mail/rspamd.nix | |||
@@ -11,9 +11,6 @@ | |||
11 | ''; | 11 | ''; |
12 | }; | 12 | }; |
13 | config = lib.mkIf config.myServices.mail.enable { | 13 | config = lib.mkIf config.myServices.mail.enable { |
14 | services.duplyBackup.profiles.mail.excludeFile = '' | ||
15 | + /var/lib/rspamd | ||
16 | ''; | ||
17 | services.cron.systemCronJobs = let | 14 | services.cron.systemCronJobs = let |
18 | cron_script = pkgs.runCommand "cron_script" { | 15 | cron_script = pkgs.runCommand "cron_script" { |
19 | buildInputs = [ pkgs.makeWrapper ]; | 16 | buildInputs = [ pkgs.makeWrapper ]; |
diff --git a/modules/private/mail/sympa.nix b/modules/private/mail/sympa.nix index 920daa9..0626ac0 100644 --- a/modules/private/mail/sympa.nix +++ b/modules/private/mail/sympa.nix | |||
@@ -15,9 +15,6 @@ in | |||
15 | } | 15 | } |
16 | ]; | 16 | ]; |
17 | }; | 17 | }; |
18 | services.duplyBackup.profiles.sympa = { | ||
19 | rootDir = "/var/lib/sympa"; | ||
20 | }; | ||
21 | services.websites.env.tools.vhostConfs.mail = { | 18 | services.websites.env.tools.vhostConfs.mail = { |
22 | extraConfig = lib.mkAfter [ | 19 | extraConfig = lib.mkAfter [ |
23 | '' | 20 | '' |