aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-10-24 00:35:49 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-10-24 00:35:49 +0200
commitd2e703c560bc029c3d607058de2935bbf1cb0559 (patch)
tree9504d46a85fb159aa09ba449d667d1304d6f8159
parentb11f0e174bc8450657c358a395f27a830dcad801 (diff)
downloadNix-d2e703c560bc029c3d607058de2935bbf1cb0559.tar.gz
Nix-d2e703c560bc029c3d607058de2935bbf1cb0559.tar.zst
Nix-d2e703c560bc029c3d607058de2935bbf1cb0559.zip
Rename backup module to duply_backup
Diffstat
-rw-r--r--modules/default.nix2
-rw-r--r--modules/duply_backup/default.nix (renamed from modules/backup/default.nix)10
-rw-r--r--modules/private/buildbot/default.nix2
-rw-r--r--modules/private/certificates.nix2
-rw-r--r--modules/private/ftp.nix2
-rw-r--r--modules/private/gitolite/default.nix2
-rw-r--r--modules/private/irc.nix2
-rw-r--r--modules/private/mail/default.nix2
-rw-r--r--modules/private/mail/dovecot.nix2
-rw-r--r--modules/private/mail/postfix.nix2
-rw-r--r--modules/private/mail/rspamd.nix2
-rw-r--r--modules/private/monitoring/default.nix2
-rw-r--r--modules/private/mpd.nix2
-rw-r--r--modules/private/pub/default.nix2
-rw-r--r--modules/private/system.nix2
-rw-r--r--modules/private/system/eldiron.nix2
-rw-r--r--modules/private/tasks/default.nix2
-rw-r--r--modules/private/websites/aten/integration.nix2
-rw-r--r--modules/private/websites/aten/production.nix2
-rw-r--r--modules/private/websites/chloe/integration.nix2
-rw-r--r--modules/private/websites/chloe/production.nix2
-rw-r--r--modules/private/websites/connexionswing/integration.nix2
-rw-r--r--modules/private/websites/connexionswing/production.nix2
-rw-r--r--modules/private/websites/default.nix2
-rw-r--r--modules/private/websites/emilia/production.nix2
-rw-r--r--modules/private/websites/florian/app.nix2
-rw-r--r--modules/private/websites/ludivinecassal/integration.nix2
-rw-r--r--modules/private/websites/ludivinecassal/production.nix2
-rw-r--r--modules/private/websites/piedsjaloux/integration.nix2
-rw-r--r--modules/private/websites/piedsjaloux/production.nix2
-rw-r--r--modules/private/websites/tools/diaspora/default.nix2
-rw-r--r--modules/private/websites/tools/ether/default.nix2
-rw-r--r--modules/private/websites/tools/mail/default.nix2
-rw-r--r--modules/private/websites/tools/mastodon/default.nix2
-rw-r--r--modules/private/websites/tools/tools/default.nix2
-rw-r--r--modules/webapps/webstats/default.nix2
36 files changed, 40 insertions, 40 deletions
diff --git a/modules/default.nix b/modules/default.nix
index 05f2bfe..18bee9a 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -13,7 +13,7 @@
13 opendmarc = ./opendmarc.nix; 13 opendmarc = ./opendmarc.nix;
14 openarc = ./openarc.nix; 14 openarc = ./openarc.nix;
15 15
16 backup = ./backup; 16 duplyBackup = ./duply_backup;
17 naemon = ./naemon; 17 naemon = ./naemon;
18 18
19 php-application = ./websites/php-application.nix; 19 php-application = ./websites/php-application.nix;
diff --git a/modules/backup/default.nix b/modules/duply_backup/default.nix
index be12231..32fa941 100644
--- a/modules/backup/default.nix
+++ b/modules/duply_backup/default.nix
@@ -27,14 +27,14 @@ let
27in 27in
28{ 28{
29 options = { 29 options = {
30 services.backup.enable = lib.mkOption { 30 services.duplyBackup.enable = lib.mkOption {
31 type = lib.types.bool; 31 type = lib.types.bool;
32 default = false; 32 default = false;
33 description = '' 33 description = ''
34 Whether to enable remote backups. 34 Whether to enable remote backups.
35 ''; 35 '';
36 }; 36 };
37 services.backup.profiles = lib.mkOption { 37 services.duplyBackup.profiles = lib.mkOption {
38 type = lib.types.attrsOf (lib.types.submodule { 38 type = lib.types.attrsOf (lib.types.submodule {
39 options = { 39 options = {
40 rootDir = lib.mkOption { 40 rootDir = lib.mkOption {
@@ -55,7 +55,7 @@ in
55 }; 55 };
56 }; 56 };
57 57
58 config = lib.mkIf config.services.backup.enable { 58 config = lib.mkIf config.services.duplyBackup.enable {
59 system.activationScripts.backup = '' 59 system.activationScripts.backup = ''
60 install -m 0700 -o root -g root -d ${varDir} ${varDir}/caches 60 install -m 0700 -o root -g root -d ${varDir} ${varDir}/caches
61 ''; 61 '';
@@ -70,7 +70,7 @@ in
70 dest = "backup/${k}/exclude"; 70 dest = "backup/${k}/exclude";
71 text = v.excludeFile; 71 text = v.excludeFile;
72 } 72 }
73 ]) config.services.backup.profiles); 73 ]) config.services.duplyBackup.profiles);
74 74
75 services.cron = { 75 services.cron = {
76 enable = true; 76 enable = true;
@@ -83,7 +83,7 @@ in
83 touch ${varDir}/${k}.log 83 touch ${varDir}/${k}.log
84 ${pkgs.duply}/bin/duply ${config.secrets.location}/backup/${k}/ ${action} --force >> ${varDir}/${k}.log 84 ${pkgs.duply}/bin/duply ${config.secrets.location}/backup/${k}/ ${action} --force >> ${varDir}/${k}.log
85 '' 85 ''
86 ) config.services.backup.profiles)} 86 ) config.services.duplyBackup.profiles)}
87 ''; 87 '';
88 in 88 in
89 [ 89 [
diff --git a/modules/private/buildbot/default.nix b/modules/private/buildbot/default.nix
index 0e63337..8a09139 100644
--- a/modules/private/buildbot/default.nix
+++ b/modules/private/buildbot/default.nix
@@ -24,7 +24,7 @@ in
24 }; 24 };
25 25
26 config = lib.mkIf config.myServices.buildbot.enable { 26 config = lib.mkIf config.myServices.buildbot.enable {
27 services.backup.profiles.buildbot = { 27 services.duplyBackup.profiles.buildbot = {
28 rootDir = varDir; 28 rootDir = varDir;
29 }; 29 };
30 ids.uids.buildbot = myconfig.env.buildbot.user.uid; 30 ids.uids.buildbot = myconfig.env.buildbot.user.uid;
diff --git a/modules/private/certificates.nix b/modules/private/certificates.nix
index 9de3e6d..337a7fc 100644
--- a/modules/private/certificates.nix
+++ b/modules/private/certificates.nix
@@ -16,7 +16,7 @@
16 }; 16 };
17 17
18 config = lib.mkIf config.myServices.certificates.enable { 18 config = lib.mkIf config.myServices.certificates.enable {
19 services.backup.profiles.system.excludeFile = '' 19 services.duplyBackup.profiles.system.excludeFile = ''
20 + ${config.security.acme.directory} 20 + ${config.security.acme.directory}
21 ''; 21 '';
22 services.websites.certs = config.myServices.certificates.certConfig; 22 services.websites.certs = config.myServices.certificates.certConfig;
diff --git a/modules/private/ftp.nix b/modules/private/ftp.nix
index a1da32f..9b6a98f 100644
--- a/modules/private/ftp.nix
+++ b/modules/private/ftp.nix
@@ -14,7 +14,7 @@ in
14 }; 14 };
15 15
16 config = lib.mkIf config.services.pure-ftpd.enable { 16 config = lib.mkIf config.services.pure-ftpd.enable {
17 services.backup.profiles.ftp = { 17 services.duplyBackup.profiles.ftp = {
18 rootDir = "/var/lib/ftp"; 18 rootDir = "/var/lib/ftp";
19 }; 19 };
20 security.acme.certs."ftp" = config.myServices.certificates.certConfig // { 20 security.acme.certs."ftp" = config.myServices.certificates.certConfig // {
diff --git a/modules/private/gitolite/default.nix b/modules/private/gitolite/default.nix
index 94ab134..658979d 100644
--- a/modules/private/gitolite/default.nix
+++ b/modules/private/gitolite/default.nix
@@ -15,7 +15,7 @@ in {
15 snippet = builtins.readFile ./ldap_gitolite.sh; 15 snippet = builtins.readFile ./ldap_gitolite.sh;
16 dependencies = [ pkgs.gitolite ]; 16 dependencies = [ pkgs.gitolite ];
17 }]; 17 }];
18 services.backup.profiles.gitolite = { 18 services.duplyBackup.profiles.gitolite = {
19 rootDir = cfg.gitoliteDir; 19 rootDir = cfg.gitoliteDir;
20 }; 20 };
21 networking.firewall.allowedTCPPorts = [ 9418 ]; 21 networking.firewall.allowedTCPPorts = [ 9418 ];
diff --git a/modules/private/irc.nix b/modules/private/irc.nix
index 785b34d..4e6eaab 100644
--- a/modules/private/irc.nix
+++ b/modules/private/irc.nix
@@ -17,7 +17,7 @@ in
17 }; 17 };
18 18
19 config = lib.mkIf cfg.enable { 19 config = lib.mkIf cfg.enable {
20 services.backup.profiles.irc = { 20 services.duplyBackup.profiles.irc = {
21 rootDir = "/var/lib/bitlbee"; 21 rootDir = "/var/lib/bitlbee";
22 }; 22 };
23 security.acme.certs."irc" = config.myServices.ircCerts // { 23 security.acme.certs."irc" = config.myServices.ircCerts // {
diff --git a/modules/private/mail/default.nix b/modules/private/mail/default.nix
index d3b2a25..8be21a1 100644
--- a/modules/private/mail/default.nix
+++ b/modules/private/mail/default.nix
@@ -18,7 +18,7 @@
18 mxs = map (zone: "mx-1.${zone.name}") zonesWithMx; 18 mxs = map (zone: "mx-1.${zone.name}") zonesWithMx;
19 in builtins.listToAttrs (map (mx: lib.attrsets.nameValuePair mx null) mxs); 19 in builtins.listToAttrs (map (mx: lib.attrsets.nameValuePair mx null) mxs);
20 }; 20 };
21 services.backup.profiles = { 21 services.duplyBackup.profiles = {
22 mail = { 22 mail = {
23 rootDir = "/var/lib"; 23 rootDir = "/var/lib";
24 excludeFile = lib.mkAfter '' 24 excludeFile = lib.mkAfter ''
diff --git a/modules/private/mail/dovecot.nix b/modules/private/mail/dovecot.nix
index dc75e0f..6220da2 100644
--- a/modules/private/mail/dovecot.nix
+++ b/modules/private/mail/dovecot.nix
@@ -13,7 +13,7 @@ let
13in 13in
14{ 14{
15 config = lib.mkIf config.myServices.mail.enable { 15 config = lib.mkIf config.myServices.mail.enable {
16 services.backup.profiles.mail.excludeFile = '' 16 services.duplyBackup.profiles.mail.excludeFile = ''
17 + /var/lib/dhparams 17 + /var/lib/dhparams
18 + /var/lib/dovecot 18 + /var/lib/dovecot
19 ''; 19 '';
diff --git a/modules/private/mail/postfix.nix b/modules/private/mail/postfix.nix
index 9fdc7bd..1386f85 100644
--- a/modules/private/mail/postfix.nix
+++ b/modules/private/mail/postfix.nix
@@ -1,7 +1,7 @@
1{ lib, pkgs, config, myconfig, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2{ 2{
3 config = lib.mkIf config.myServices.mail.enable { 3 config = lib.mkIf config.myServices.mail.enable {
4 services.backup.profiles.mail.excludeFile = '' 4 services.duplyBackup.profiles.mail.excludeFile = ''
5 + /var/lib/postfix 5 + /var/lib/postfix
6 ''; 6 '';
7 secrets.keys = [ 7 secrets.keys = [
diff --git a/modules/private/mail/rspamd.nix b/modules/private/mail/rspamd.nix
index 5e0a239..b5f64d8 100644
--- a/modules/private/mail/rspamd.nix
+++ b/modules/private/mail/rspamd.nix
@@ -11,7 +11,7 @@
11 ''; 11 '';
12 }; 12 };
13 config = lib.mkIf config.myServices.mail.enable { 13 config = lib.mkIf config.myServices.mail.enable {
14 services.backup.profiles.mail.excludeFile = '' 14 services.duplyBackup.profiles.mail.excludeFile = ''
15 + /var/lib/rspamd 15 + /var/lib/rspamd
16 ''; 16 '';
17 services.cron.systemCronJobs = let 17 services.cron.systemCronJobs = let
diff --git a/modules/private/monitoring/default.nix b/modules/private/monitoring/default.nix
index 902b2b1..c5acd40 100644
--- a/modules/private/monitoring/default.nix
+++ b/modules/private/monitoring/default.nix
@@ -27,7 +27,7 @@ in
27 }; 27 };
28 28
29 config = lib.mkIf config.myServices.monitoring.enable { 29 config = lib.mkIf config.myServices.monitoring.enable {
30 services.backup.profiles.monitoring = { 30 services.duplyBackup.profiles.monitoring = {
31 rootDir = config.services.naemon.varDir; 31 rootDir = config.services.naemon.varDir;
32 }; 32 };
33 security.sudo.extraRules = [ 33 security.sudo.extraRules = [
diff --git a/modules/private/mpd.nix b/modules/private/mpd.nix
index 759c9d3..c7e2486 100644
--- a/modules/private/mpd.nix
+++ b/modules/private/mpd.nix
@@ -2,7 +2,7 @@
2{ 2{
3 options.myServices.mpd.enable = lib.mkEnableOption "enable MPD"; 3 options.myServices.mpd.enable = lib.mkEnableOption "enable MPD";
4 config = lib.mkIf config.myServices.mpd.enable { 4 config = lib.mkIf config.myServices.mpd.enable {
5 services.backup.profiles.mpd = { 5 services.duplyBackup.profiles.mpd = {
6 rootDir = "/var/lib/mpd"; 6 rootDir = "/var/lib/mpd";
7 }; 7 };
8 secrets.keys = [ 8 secrets.keys = [
diff --git a/modules/private/pub/default.nix b/modules/private/pub/default.nix
index 7eaabc9..835bcec 100644
--- a/modules/private/pub/default.nix
+++ b/modules/private/pub/default.nix
@@ -15,7 +15,7 @@
15 snippet = builtins.readFile ./ldap_pub.sh; 15 snippet = builtins.readFile ./ldap_pub.sh;
16 dependencies = [ pkgs.coreutils ]; 16 dependencies = [ pkgs.coreutils ];
17 }]; 17 }];
18 services.backup.profiles.pub = { 18 services.duplyBackup.profiles.pub = {
19 rootDir = "/var/lib/pub"; 19 rootDir = "/var/lib/pub";
20 }; 20 };
21 users.users.pub = let 21 users.users.pub = let
diff --git a/modules/private/system.nix b/modules/private/system.nix
index c12c226..1ddfd2e 100644
--- a/modules/private/system.nix
+++ b/modules/private/system.nix
@@ -1,7 +1,7 @@
1{ pkgs, privateFiles, lib, ... }: 1{ pkgs, privateFiles, lib, ... }:
2{ 2{
3 config = { 3 config = {
4 services.backup.profiles.system = { 4 services.duplyBackup.profiles.system = {
5 rootDir = "/var/lib"; 5 rootDir = "/var/lib";
6 excludeFile = lib.mkAfter '' 6 excludeFile = lib.mkAfter ''
7 + /var/lib/nixos 7 + /var/lib/nixos
diff --git a/modules/private/system/eldiron.nix b/modules/private/system/eldiron.nix
index 079216b..5384bc2 100644
--- a/modules/private/system/eldiron.nix
+++ b/modules/private/system/eldiron.nix
@@ -34,7 +34,7 @@
34 myServices.websites.enable = true; 34 myServices.websites.enable = true;
35 myServices.mail.enable = true; 35 myServices.mail.enable = true;
36 services.pure-ftpd.enable = true; 36 services.pure-ftpd.enable = true;
37 services.backup.enable = true; 37 services.duplyBackup.enable = true;
38 38
39 deployment = { 39 deployment = {
40 targetEnv = "hetzner"; 40 targetEnv = "hetzner";
diff --git a/modules/private/tasks/default.nix b/modules/private/tasks/default.nix
index 88d3b7a..b345e5a 100644
--- a/modules/private/tasks/default.nix
+++ b/modules/private/tasks/default.nix
@@ -86,7 +86,7 @@ in {
86 }; 86 };
87 87
88 config = lib.mkIf cfg.enable { 88 config = lib.mkIf cfg.enable {
89 services.backup.profiles.tasks = { 89 services.duplyBackup.profiles.tasks = {
90 rootDir = "/var/lib"; 90 rootDir = "/var/lib";
91 excludeFile = '' 91 excludeFile = ''
92 + /var/lib/taskserver 92 + /var/lib/taskserver
diff --git a/modules/private/websites/aten/integration.nix b/modules/private/websites/aten/integration.nix
index 0c92818..7aadf58 100644
--- a/modules/private/websites/aten/integration.nix
+++ b/modules/private/websites/aten/integration.nix
@@ -8,7 +8,7 @@ in {
8 options.myServices.websites.aten.integration.enable = lib.mkEnableOption "enable Aten's website in integration"; 8 options.myServices.websites.aten.integration.enable = lib.mkEnableOption "enable Aten's website in integration";
9 9
10 config = lib.mkIf cfg.enable { 10 config = lib.mkIf cfg.enable {
11 services.backup.profiles.aten_dev.rootDir = app.varDir; 11 services.duplyBackup.profiles.aten_dev.rootDir = app.varDir;
12 services.phpApplication.apps.aten_dev = { 12 services.phpApplication.apps.aten_dev = {
13 websiteEnv = "integration"; 13 websiteEnv = "integration";
14 httpdUser = config.services.httpd.Inte.user; 14 httpdUser = config.services.httpd.Inte.user;
diff --git a/modules/private/websites/aten/production.nix b/modules/private/websites/aten/production.nix
index 2ffcef3..16a909a 100644
--- a/modules/private/websites/aten/production.nix
+++ b/modules/private/websites/aten/production.nix
@@ -8,7 +8,7 @@ in {
8 options.myServices.websites.aten.production.enable = lib.mkEnableOption "enable Aten's website in production"; 8 options.myServices.websites.aten.production.enable = lib.mkEnableOption "enable Aten's website in production";
9 9
10 config = lib.mkIf cfg.enable { 10 config = lib.mkIf cfg.enable {
11 services.backup.profiles.aten_prod.rootDir = app.varDir; 11 services.duplyBackup.profiles.aten_prod.rootDir = app.varDir;
12 services.webstats.sites = [ { name = "aten.pro"; } ]; 12 services.webstats.sites = [ { name = "aten.pro"; } ];
13 services.phpApplication.apps.aten_prod = { 13 services.phpApplication.apps.aten_prod = {
14 websiteEnv = "production"; 14 websiteEnv = "production";
diff --git a/modules/private/websites/chloe/integration.nix b/modules/private/websites/chloe/integration.nix
index 75e25af..00c76a5 100644
--- a/modules/private/websites/chloe/integration.nix
+++ b/modules/private/websites/chloe/integration.nix
@@ -12,7 +12,7 @@ in {
12 options.myServices.websites.chloe.integration.enable = lib.mkEnableOption "enable Chloe's website in integration"; 12 options.myServices.websites.chloe.integration.enable = lib.mkEnableOption "enable Chloe's website in integration";
13 13
14 config = lib.mkIf cfg.enable { 14 config = lib.mkIf cfg.enable {
15 services.backup.profiles.chloe_dev.rootDir = chloe.app.varDir; 15 services.duplyBackup.profiles.chloe_dev.rootDir = chloe.app.varDir;
16 secrets.keys = chloe.keys; 16 secrets.keys = chloe.keys;
17 systemd.services.phpfpm-chloe_dev.after = lib.mkAfter chloe.phpFpm.serviceDeps; 17 systemd.services.phpfpm-chloe_dev.after = lib.mkAfter chloe.phpFpm.serviceDeps;
18 systemd.services.phpfpm-chloe_dev.wants = chloe.phpFpm.serviceDeps; 18 systemd.services.phpfpm-chloe_dev.wants = chloe.phpFpm.serviceDeps;
diff --git a/modules/private/websites/chloe/production.nix b/modules/private/websites/chloe/production.nix
index 7c59806..0562de8 100644
--- a/modules/private/websites/chloe/production.nix
+++ b/modules/private/websites/chloe/production.nix
@@ -12,7 +12,7 @@ in {
12 options.myServices.websites.chloe.production.enable = lib.mkEnableOption "enable Chloe's website in production"; 12 options.myServices.websites.chloe.production.enable = lib.mkEnableOption "enable Chloe's website in production";
13 13
14 config = lib.mkIf cfg.enable { 14 config = lib.mkIf cfg.enable {
15 services.backup.profiles.chloe_prod.rootDir = chloe.app.varDir; 15 services.duplyBackup.profiles.chloe_prod.rootDir = chloe.app.varDir;
16 secrets.keys = chloe.keys; 16 secrets.keys = chloe.keys;
17 services.webstats.sites = [ { name = "osteopathe-cc.fr"; } ]; 17 services.webstats.sites = [ { name = "osteopathe-cc.fr"; } ];
18 18
diff --git a/modules/private/websites/connexionswing/integration.nix b/modules/private/websites/connexionswing/integration.nix
index fee8e4f..54dbf54 100644
--- a/modules/private/websites/connexionswing/integration.nix
+++ b/modules/private/websites/connexionswing/integration.nix
@@ -8,7 +8,7 @@ in {
8 options.myServices.websites.connexionswing.integration.enable = lib.mkEnableOption "enable Connexionswing's website in integration"; 8 options.myServices.websites.connexionswing.integration.enable = lib.mkEnableOption "enable Connexionswing's website in integration";
9 9
10 config = lib.mkIf cfg.enable { 10 config = lib.mkIf cfg.enable {
11 services.backup.profiles.connexionswing_dev.rootDir = app.varDir; 11 services.duplyBackup.profiles.connexionswing_dev.rootDir = app.varDir;
12 services.phpApplication.apps.connexionswing_dev = { 12 services.phpApplication.apps.connexionswing_dev = {
13 websiteEnv = "integration"; 13 websiteEnv = "integration";
14 httpdUser = config.services.httpd.Inte.user; 14 httpdUser = config.services.httpd.Inte.user;
diff --git a/modules/private/websites/connexionswing/production.nix b/modules/private/websites/connexionswing/production.nix
index 79e672a..af37e29 100644
--- a/modules/private/websites/connexionswing/production.nix
+++ b/modules/private/websites/connexionswing/production.nix
@@ -8,7 +8,7 @@ in {
8 options.myServices.websites.connexionswing.production.enable = lib.mkEnableOption "enable Connexionswing's website in production"; 8 options.myServices.websites.connexionswing.production.enable = lib.mkEnableOption "enable Connexionswing's website in production";
9 9
10 config = lib.mkIf cfg.enable { 10 config = lib.mkIf cfg.enable {
11 services.backup.profiles.connexionswing_prod.rootDir = app.varDir; 11 services.duplyBackup.profiles.connexionswing_prod.rootDir = app.varDir;
12 services.webstats.sites = [ { name = "connexionswing.com"; } ]; 12 services.webstats.sites = [ { name = "connexionswing.com"; } ];
13 services.phpApplication.apps.connexionswing_prod = { 13 services.phpApplication.apps.connexionswing_prod = {
14 websiteEnv = "production"; 14 websiteEnv = "production";
diff --git a/modules/private/websites/default.nix b/modules/private/websites/default.nix
index 119d62e..87fdd73 100644
--- a/modules/private/websites/default.nix
+++ b/modules/private/websites/default.nix
@@ -77,7 +77,7 @@ in
77 }; 77 };
78 78
79 config = lib.mkIf config.myServices.websites.enable { 79 config = lib.mkIf config.myServices.websites.enable {
80 services.backup.profiles.php = { 80 services.duplyBackup.profiles.php = {
81 rootDir = "/var/lib/php"; 81 rootDir = "/var/lib/php";
82 }; 82 };
83 users.users.wwwrun.extraGroups = [ "keys" ]; 83 users.users.wwwrun.extraGroups = [ "keys" ];
diff --git a/modules/private/websites/emilia/production.nix b/modules/private/websites/emilia/production.nix
index 0dab316..5bf39c9 100644
--- a/modules/private/websites/emilia/production.nix
+++ b/modules/private/websites/emilia/production.nix
@@ -43,7 +43,7 @@ in {
43 options.myServices.websites.emilia.production.enable = lib.mkEnableOption "enable Emilia's website"; 43 options.myServices.websites.emilia.production.enable = lib.mkEnableOption "enable Emilia's website";
44 44
45 config = lib.mkIf cfg.enable { 45 config = lib.mkIf cfg.enable {
46 services.backup.profiles.emilia_prod = { 46 services.duplyBackup.profiles.emilia_prod = {
47 rootDir = varDir; 47 rootDir = varDir;
48 }; 48 };
49 system.activationScripts.emilia = '' 49 system.activationScripts.emilia = ''
diff --git a/modules/private/websites/florian/app.nix b/modules/private/websites/florian/app.nix
index 7e2c333..e6e16fa 100644
--- a/modules/private/websites/florian/app.nix
+++ b/modules/private/websites/florian/app.nix
@@ -9,7 +9,7 @@ in {
9 options.myServices.websites.florian.app.enable = lib.mkEnableOption "enable Florian's app in integration"; 9 options.myServices.websites.florian.app.enable = lib.mkEnableOption "enable Florian's app in integration";
10 10
11 config = lib.mkIf cfg.enable { 11 config = lib.mkIf cfg.enable {
12 services.backup.profiles.tellesflorian_dev.rootDir = app.varDir; 12 services.duplyBackup.profiles.tellesflorian_dev.rootDir = app.varDir;
13 services.phpApplication.apps.florian_dev = { 13 services.phpApplication.apps.florian_dev = {
14 websiteEnv = "integration"; 14 websiteEnv = "integration";
15 httpdUser = config.services.httpd.Inte.user; 15 httpdUser = config.services.httpd.Inte.user;
diff --git a/modules/private/websites/ludivinecassal/integration.nix b/modules/private/websites/ludivinecassal/integration.nix
index d1b8f9b..5d9afc1 100644
--- a/modules/private/websites/ludivinecassal/integration.nix
+++ b/modules/private/websites/ludivinecassal/integration.nix
@@ -8,7 +8,7 @@ in {
8 options.myServices.websites.ludivinecassal.integration.enable = lib.mkEnableOption "enable Ludivine's website in integration"; 8 options.myServices.websites.ludivinecassal.integration.enable = lib.mkEnableOption "enable Ludivine's website in integration";
9 9
10 config = lib.mkIf cfg.enable { 10 config = lib.mkIf cfg.enable {
11 services.backup.profiles.ludivinecassal_dev.rootDir = app.varDir; 11 services.duplyBackup.profiles.ludivinecassal_dev.rootDir = app.varDir;
12 services.phpApplication.apps.ludivinecassal_dev = { 12 services.phpApplication.apps.ludivinecassal_dev = {
13 websiteEnv = "integration"; 13 websiteEnv = "integration";
14 httpdUser = config.services.httpd.Inte.user; 14 httpdUser = config.services.httpd.Inte.user;
diff --git a/modules/private/websites/ludivinecassal/production.nix b/modules/private/websites/ludivinecassal/production.nix
index 341fd6d..1a8b958 100644
--- a/modules/private/websites/ludivinecassal/production.nix
+++ b/modules/private/websites/ludivinecassal/production.nix
@@ -8,7 +8,7 @@ in {
8 options.myServices.websites.ludivinecassal.production.enable = lib.mkEnableOption "enable Ludivine's website in production"; 8 options.myServices.websites.ludivinecassal.production.enable = lib.mkEnableOption "enable Ludivine's website in production";
9 9
10 config = lib.mkIf cfg.enable { 10 config = lib.mkIf cfg.enable {
11 services.backup.profiles.ludivinecassal_prod.rootDir = app.varDir; 11 services.duplyBackup.profiles.ludivinecassal_prod.rootDir = app.varDir;
12 services.webstats.sites = [ { name = "ludivinecassal.com"; } ]; 12 services.webstats.sites = [ { name = "ludivinecassal.com"; } ];
13 services.phpApplication.apps.ludivinecassal_prod = { 13 services.phpApplication.apps.ludivinecassal_prod = {
14 websiteEnv = "production"; 14 websiteEnv = "production";
diff --git a/modules/private/websites/piedsjaloux/integration.nix b/modules/private/websites/piedsjaloux/integration.nix
index 853fcff..8d7cf3a 100644
--- a/modules/private/websites/piedsjaloux/integration.nix
+++ b/modules/private/websites/piedsjaloux/integration.nix
@@ -8,7 +8,7 @@ in {
8 options.myServices.websites.piedsjaloux.integration.enable = lib.mkEnableOption "enable PiedsJaloux's website in integration"; 8 options.myServices.websites.piedsjaloux.integration.enable = lib.mkEnableOption "enable PiedsJaloux's website in integration";
9 9
10 config = lib.mkIf cfg.enable { 10 config = lib.mkIf cfg.enable {
11 services.backup.profiles.piedsjaloux_dev.rootDir = app.varDir; 11 services.duplyBackup.profiles.piedsjaloux_dev.rootDir = app.varDir;
12 services.phpApplication.apps.piedsjaloux_dev = { 12 services.phpApplication.apps.piedsjaloux_dev = {
13 websiteEnv = "integration"; 13 websiteEnv = "integration";
14 httpdUser = config.services.httpd.Inte.user; 14 httpdUser = config.services.httpd.Inte.user;
diff --git a/modules/private/websites/piedsjaloux/production.nix b/modules/private/websites/piedsjaloux/production.nix
index 9e64fca..2267e03 100644
--- a/modules/private/websites/piedsjaloux/production.nix
+++ b/modules/private/websites/piedsjaloux/production.nix
@@ -8,7 +8,7 @@ in {
8 options.myServices.websites.piedsjaloux.production.enable = lib.mkEnableOption "enable PiedsJaloux's website in production"; 8 options.myServices.websites.piedsjaloux.production.enable = lib.mkEnableOption "enable PiedsJaloux's website in production";
9 9
10 config = lib.mkIf cfg.enable { 10 config = lib.mkIf cfg.enable {
11 services.backup.profiles.piedsjaloux_prod.rootDir = app.varDir; 11 services.duplyBackup.profiles.piedsjaloux_prod.rootDir = app.varDir;
12 services.webstats.sites = [ { name = "piedsjaloux.fr"; } ]; 12 services.webstats.sites = [ { name = "piedsjaloux.fr"; } ];
13 services.phpApplication.apps.piedsjaloux_prod = { 13 services.phpApplication.apps.piedsjaloux_prod = {
14 websiteEnv = "production"; 14 websiteEnv = "production";
diff --git a/modules/private/websites/tools/diaspora/default.nix b/modules/private/websites/tools/diaspora/default.nix
index 24d3d51..20ae055 100644
--- a/modules/private/websites/tools/diaspora/default.nix
+++ b/modules/private/websites/tools/diaspora/default.nix
@@ -10,7 +10,7 @@ in {
10 }; 10 };
11 11
12 config = lib.mkIf cfg.enable { 12 config = lib.mkIf cfg.enable {
13 services.backup.profiles.diaspora = { 13 services.duplyBackup.profiles.diaspora = {
14 rootDir = dcfg.dataDir; 14 rootDir = dcfg.dataDir;
15 }; 15 };
16 users.users.diaspora.extraGroups = [ "keys" ]; 16 users.users.diaspora.extraGroups = [ "keys" ];
diff --git a/modules/private/websites/tools/ether/default.nix b/modules/private/websites/tools/ether/default.nix
index 600254b..62a1691 100644
--- a/modules/private/websites/tools/ether/default.nix
+++ b/modules/private/websites/tools/ether/default.nix
@@ -12,7 +12,7 @@ in {
12 }; 12 };
13 13
14 config = lib.mkIf cfg.enable { 14 config = lib.mkIf cfg.enable {
15 services.backup.profiles.etherpad-lite = { 15 services.duplyBackup.profiles.etherpad-lite = {
16 rootDir = "/var/lib/private/etherpad-lite"; 16 rootDir = "/var/lib/private/etherpad-lite";
17 }; 17 };
18 secrets.keys = [ 18 secrets.keys = [
diff --git a/modules/private/websites/tools/mail/default.nix b/modules/private/websites/tools/mail/default.nix
index 35711af..218c3a5 100644
--- a/modules/private/websites/tools/mail/default.nix
+++ b/modules/private/websites/tools/mail/default.nix
@@ -17,7 +17,7 @@ in
17 ]; 17 ];
18 18
19 config = lib.mkIf cfg.enable { 19 config = lib.mkIf cfg.enable {
20 services.backup.profiles.mail.excludeFile = '' 20 services.duplyBackup.profiles.mail.excludeFile = ''
21 + ${rainloop.varDir} 21 + ${rainloop.varDir}
22 + ${roundcubemail.varDir} 22 + ${roundcubemail.varDir}
23 ''; 23 '';
diff --git a/modules/private/websites/tools/mastodon/default.nix b/modules/private/websites/tools/mastodon/default.nix
index 2236bd5..97f2452 100644
--- a/modules/private/websites/tools/mastodon/default.nix
+++ b/modules/private/websites/tools/mastodon/default.nix
@@ -10,7 +10,7 @@ in {
10 }; 10 };
11 11
12 config = lib.mkIf cfg.enable { 12 config = lib.mkIf cfg.enable {
13 services.backup.profiles.mastodon = { 13 services.duplyBackup.profiles.mastodon = {
14 rootDir = mcfg.dataDir; 14 rootDir = mcfg.dataDir;
15 }; 15 };
16 secrets.keys = [{ 16 secrets.keys = [{
diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix
index 6f27b0b..3cf3e8e 100644
--- a/modules/private/websites/tools/tools/default.nix
+++ b/modules/private/websites/tools/tools/default.nix
@@ -51,7 +51,7 @@ in {
51 ++ wallabag.keys 51 ++ wallabag.keys
52 ++ yourls.keys; 52 ++ yourls.keys;
53 53
54 services.backup.profiles = { 54 services.duplyBackup.profiles = {
55 dokuwiki = dokuwiki.backups; 55 dokuwiki = dokuwiki.backups;
56 kanboard = kanboard.backups; 56 kanboard = kanboard.backups;
57 rompr = rompr.backups; 57 rompr = rompr.backups;
diff --git a/modules/webapps/webstats/default.nix b/modules/webapps/webstats/default.nix
index 6771f01..e822645 100644
--- a/modules/webapps/webstats/default.nix
+++ b/modules/webapps/webstats/default.nix
@@ -37,7 +37,7 @@ in {
37 }; 37 };
38 38
39 config = lib.mkIf (builtins.length cfg.sites > 0) { 39 config = lib.mkIf (builtins.length cfg.sites > 0) {
40 services.backup.profiles.goaccess = { 40 services.duplyBackup.profiles.goaccess = {
41 rootDir = cfg.dataDir; 41 rootDir = cfg.dataDir;
42 }; 42 };
43 users.users.root.packages = [ 43 users.users.root.packages = [
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 04:38:20 +0000