diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2021-10-22 20:55:31 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2021-10-23 01:45:07 +0200 |
commit | 5315b439af1f72c3282549508ae58d86d66e38ec (patch) | |
tree | 649e191a57f97635f4c941a4cade04074a6d96f4 /modules | |
parent | 41cce84a02652e22ad967c9f31669092eb3e7f0e (diff) | |
download | Nix-5315b439af1f72c3282549508ae58d86d66e38ec.tar.gz Nix-5315b439af1f72c3282549508ae58d86d66e38ec.tar.zst Nix-5315b439af1f72c3282549508ae58d86d66e38ec.zip |
Remove duply-backup
Diffstat (limited to 'modules')
50 files changed, 1 insertions, 189 deletions
diff --git a/modules/private/buildbot/default.nix b/modules/private/buildbot/default.nix index dc8a0d2..ec28b63 100644 --- a/modules/private/buildbot/default.nix +++ b/modules/private/buildbot/default.nix | |||
@@ -24,10 +24,6 @@ in | |||
24 | }; | 24 | }; |
25 | 25 | ||
26 | config = lib.mkIf config.myServices.buildbot.enable { | 26 | config = lib.mkIf config.myServices.buildbot.enable { |
27 | services.duplyBackup.profiles.buildbot = { | ||
28 | rootDir = varDir; | ||
29 | remotes = [ "eriomem" "ovh" ]; | ||
30 | }; | ||
31 | ids.uids.buildbot = config.myEnv.buildbot.user.uid; | 27 | ids.uids.buildbot = config.myEnv.buildbot.user.uid; |
32 | ids.gids.buildbot = config.myEnv.buildbot.user.gid; | 28 | ids.gids.buildbot = config.myEnv.buildbot.user.gid; |
33 | 29 | ||
diff --git a/modules/private/certificates.nix b/modules/private/certificates.nix index c568783..1881ac8 100644 --- a/modules/private/certificates.nix +++ b/modules/private/certificates.nix | |||
@@ -24,9 +24,6 @@ | |||
24 | }; | 24 | }; |
25 | 25 | ||
26 | config = lib.mkIf config.myServices.certificates.enable { | 26 | config = lib.mkIf config.myServices.certificates.enable { |
27 | services.duplyBackup.profiles.system.excludeFile = '' | ||
28 | + ${config.myServices.certificates.webroot} | ||
29 | ''; | ||
30 | services.nginx = { | 27 | services.nginx = { |
31 | recommendedTlsSettings = true; | 28 | recommendedTlsSettings = true; |
32 | virtualHosts = { | 29 | virtualHosts = { |
diff --git a/modules/private/ftp.nix b/modules/private/ftp.nix index 111d6bc..f87ce44 100644 --- a/modules/private/ftp.nix +++ b/modules/private/ftp.nix | |||
@@ -30,10 +30,6 @@ in | |||
30 | }; | 30 | }; |
31 | 31 | ||
32 | config = lib.mkIf config.myServices.ftp.enable { | 32 | config = lib.mkIf config.myServices.ftp.enable { |
33 | services.duplyBackup.profiles.ftp = { | ||
34 | rootDir = "/var/lib/ftp"; | ||
35 | remotes = [ "eriomem" "ovh" ]; | ||
36 | }; | ||
37 | security.acme.certs."ftp" = config.myServices.certificates.certConfig // { | 33 | security.acme.certs."ftp" = config.myServices.certificates.certConfig // { |
38 | domain = "eldiron.immae.eu"; | 34 | domain = "eldiron.immae.eu"; |
39 | postRun = (lib.optionalString pure-ftpd-enabled '' | 35 | postRun = (lib.optionalString pure-ftpd-enabled '' |
diff --git a/modules/private/gitolite/default.nix b/modules/private/gitolite/default.nix index 20d2cd5..6a74734 100644 --- a/modules/private/gitolite/default.nix +++ b/modules/private/gitolite/default.nix | |||
@@ -15,10 +15,6 @@ 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.duplyBackup.profiles.gitolite = { | ||
19 | rootDir = cfg.gitoliteDir; | ||
20 | remotes = [ "eriomem" "ovh" ]; | ||
21 | }; | ||
22 | networking.firewall.allowedTCPPorts = [ 9418 ]; | 18 | networking.firewall.allowedTCPPorts = [ 9418 ]; |
23 | 19 | ||
24 | secrets.keys."gitolite/ldap_password" = { | 20 | secrets.keys."gitolite/ldap_password" = { |
diff --git a/modules/private/irc.nix b/modules/private/irc.nix index 9871508..bc0bfb4 100644 --- a/modules/private/irc.nix +++ b/modules/private/irc.nix | |||
@@ -17,9 +17,6 @@ in | |||
17 | }; | 17 | }; |
18 | 18 | ||
19 | config = lib.mkIf cfg.enable { | 19 | config = lib.mkIf cfg.enable { |
20 | services.duplyBackup.profiles.irc = { | ||
21 | rootDir = "/var/lib/bitlbee"; | ||
22 | }; | ||
23 | security.acme.certs."irc" = config.myServices.ircCerts // { | 20 | security.acme.certs."irc" = config.myServices.ircCerts // { |
24 | domain = "irc.immae.eu"; | 21 | domain = "irc.immae.eu"; |
25 | postRun = '' | 22 | postRun = '' |
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 | '' |
diff --git a/modules/private/monitoring/default.nix b/modules/private/monitoring/default.nix index bdb5c93..0783c2f 100644 --- a/modules/private/monitoring/default.nix +++ b/modules/private/monitoring/default.nix | |||
@@ -174,9 +174,6 @@ in | |||
174 | }; | 174 | }; |
175 | }; | 175 | }; |
176 | 176 | ||
177 | services.duplyBackup.profiles.monitoring = { | ||
178 | rootDir = config.services.naemon.varDir; | ||
179 | }; | ||
180 | security.sudo.extraRules = let | 177 | security.sudo.extraRules = let |
181 | pluginsSudo = lib.lists.remove null (lib.attrsets.mapAttrsToList (k: v: | 178 | pluginsSudo = lib.lists.remove null (lib.attrsets.mapAttrsToList (k: v: |
182 | if (v ? sudo) | 179 | if (v ? sudo) |
diff --git a/modules/private/monitoring/objects_monitoring-1.nix b/modules/private/monitoring/objects_monitoring-1.nix index 0e7d9df..563be16 100644 --- a/modules/private/monitoring/objects_monitoring-1.nix +++ b/modules/private/monitoring/objects_monitoring-1.nix | |||
@@ -1,26 +1,4 @@ | |||
1 | { config, pkgs, nodes, hostFQDN, emailCheck, lib, ... }: | 1 | { config, pkgs, nodes, hostFQDN, emailCheck, lib, ... }: |
2 | let | ||
3 | to_resource = func: cfg: lib.flatten (lib.optionals cfg.enable (lib.mapAttrsToList func cfg.profiles)); | ||
4 | to_backup_age_dependency = name: profile: map (remote: | ||
5 | { | ||
6 | dependent_host_name = "eldiron.immae.eu"; | ||
7 | host_name = "eldiron.immae.eu"; | ||
8 | dependent_service_description = "${remote} backup for ${name} is not too old"; | ||
9 | service_description = "${remote} backup is up and not full"; | ||
10 | execution_failure_criteria = "u"; | ||
11 | notification_failure_criteria = "u"; | ||
12 | }) profile.remotes; | ||
13 | to_backup_age = name: profile: map (remote: | ||
14 | { | ||
15 | service_description = "${remote} backup for ${name} is not too old"; | ||
16 | host_name = "eldiron.immae.eu"; | ||
17 | use = "external-service"; | ||
18 | check_command = ["check_backup_${remote}_age" name]; | ||
19 | |||
20 | check_interval = "120"; | ||
21 | notification_interval = "1440"; | ||
22 | }) profile.remotes; | ||
23 | in | ||
24 | { | 2 | { |
25 | activatedPlugins = [ "dns" "ftp" "git" "http" "imap" "ovh" "tcp" ]; | 3 | activatedPlugins = [ "dns" "ftp" "git" "http" "imap" "ovh" "tcp" ]; |
26 | host = { | 4 | host = { |
@@ -718,7 +696,7 @@ in | |||
718 | check_command = [ "check_https" "origny.tiboqorl.fr" "/" "<title>Home Assistant" ]; | 696 | check_command = [ "check_https" "origny.tiboqorl.fr" "/" "<title>Home Assistant" ]; |
719 | _webstatus_namespace = "tiboqorl"; | 697 | _webstatus_namespace = "tiboqorl"; |
720 | } | 698 | } |
721 | ] ++ to_resource to_backup_age nodes.eldiron.config.services.duplyBackup; | 699 | ]; |
722 | contact = { | 700 | contact = { |
723 | telio-tortay = config.myEnv.monitoring.contacts.telio-tortay // { | 701 | telio-tortay = config.myEnv.monitoring.contacts.telio-tortay // { |
724 | use = "generic-contact"; | 702 | use = "generic-contact"; |
@@ -733,5 +711,4 @@ in | |||
733 | telio-tortay = { alias = "Telio Tortay"; members = "immae"; }; | 711 | telio-tortay = { alias = "Telio Tortay"; members = "immae"; }; |
734 | tiboqorl = { alias = "Tiboqorl"; members = "immae"; }; | 712 | tiboqorl = { alias = "Tiboqorl"; members = "immae"; }; |
735 | }; | 713 | }; |
736 | servicedependency = to_resource to_backup_age_dependency nodes.eldiron.config.services.duplyBackup; | ||
737 | } | 714 | } |
diff --git a/modules/private/mpd.nix b/modules/private/mpd.nix index 7fa8fe9..640b001 100644 --- a/modules/private/mpd.nix +++ b/modules/private/mpd.nix | |||
@@ -2,9 +2,6 @@ | |||
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.duplyBackup.profiles.mpd = { | ||
6 | rootDir = "/var/lib/mpd"; | ||
7 | }; | ||
8 | secrets.keys = { | 5 | secrets.keys = { |
9 | "mpd" = { | 6 | "mpd" = { |
10 | permissions = "0400"; | 7 | permissions = "0400"; |
diff --git a/modules/private/pub/default.nix b/modules/private/pub/default.nix index 18c146b..c419530 100644 --- a/modules/private/pub/default.nix +++ b/modules/private/pub/default.nix | |||
@@ -15,10 +15,6 @@ | |||
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.duplyBackup.profiles.pub = { | ||
19 | rootDir = "/var/lib/pub"; | ||
20 | remotes = [ "eriomem" "ovh" ]; | ||
21 | }; | ||
22 | users.users.pub = let | 18 | users.users.pub = let |
23 | restrict = pkgs.runCommand "restrict" { | 19 | restrict = pkgs.runCommand "restrict" { |
24 | file = ./restrict; | 20 | file = ./restrict; |
diff --git a/modules/private/system.nix b/modules/private/system.nix index 8be7368..5f3d79e 100644 --- a/modules/private/system.nix +++ b/modules/private/system.nix | |||
@@ -21,17 +21,6 @@ | |||
21 | 21 | ||
22 | services.openssh.enable = true; | 22 | services.openssh.enable = true; |
23 | 23 | ||
24 | services.duplyBackup.profiles.system = { | ||
25 | rootDir = "/var/lib"; | ||
26 | excludeFile = lib.mkAfter '' | ||
27 | + /var/lib/nixos | ||
28 | + /var/lib/udev | ||
29 | + /var/lib/udisks2 | ||
30 | + /var/lib/systemd | ||
31 | + /var/lib/private/systemd | ||
32 | - /var/lib | ||
33 | ''; | ||
34 | }; | ||
35 | nixpkgs.overlays = builtins.attrValues (import ../../overlays) ++ [ | 24 | nixpkgs.overlays = builtins.attrValues (import ../../overlays) ++ [ |
36 | (self: super: { | 25 | (self: super: { |
37 | postgresql = self.postgresql_pam; | 26 | postgresql = self.postgresql_pam; |
diff --git a/modules/private/system/eldiron.nix b/modules/private/system/eldiron.nix index 39cf86a..8b2784d 100644 --- a/modules/private/system/eldiron.nix +++ b/modules/private/system/eldiron.nix | |||
@@ -117,8 +117,6 @@ | |||
117 | myServices.ejabberd.enable = true; | 117 | myServices.ejabberd.enable = true; |
118 | myServices.vpn.enable = true; | 118 | myServices.vpn.enable = true; |
119 | myServices.ftp.enable = true; | 119 | myServices.ftp.enable = true; |
120 | services.duplyBackup.enable = false; | ||
121 | services.duplyBackup.profiles.oldies.rootDir = "/var/lib/oldies"; | ||
122 | 120 | ||
123 | services.netdata.enable = true; | 121 | services.netdata.enable = true; |
124 | services.netdata.config.global."memory mode" = "none"; | 122 | services.netdata.config.global."memory mode" = "none"; |
diff --git a/modules/private/tasks/default.nix b/modules/private/tasks/default.nix index 26112dd..6480255 100644 --- a/modules/private/tasks/default.nix +++ b/modules/private/tasks/default.nix | |||
@@ -86,15 +86,6 @@ in { | |||
86 | }; | 86 | }; |
87 | 87 | ||
88 | config = lib.mkIf cfg.enable { | 88 | config = lib.mkIf cfg.enable { |
89 | services.duplyBackup.profiles.tasks = { | ||
90 | rootDir = "/var/lib"; | ||
91 | excludeFile = '' | ||
92 | + /var/lib/taskserver | ||
93 | + /var/lib/taskwarrior-web | ||
94 | - /var/lib | ||
95 | ''; | ||
96 | }; | ||
97 | |||
98 | secrets.keys = { | 89 | secrets.keys = { |
99 | "webapps/tools-taskwarrior-web" = { | 90 | "webapps/tools-taskwarrior-web" = { |
100 | user = "wwwrun"; | 91 | user = "wwwrun"; |
diff --git a/modules/private/websites/chloe/integration.nix b/modules/private/websites/chloe/integration.nix index aedf3a5..4dc4bf3 100644 --- a/modules/private/websites/chloe/integration.nix +++ b/modules/private/websites/chloe/integration.nix | |||
@@ -10,7 +10,6 @@ in { | |||
10 | options.myServices.websites.chloe.integration.enable = lib.mkEnableOption "enable Chloe's website in integration"; | 10 | options.myServices.websites.chloe.integration.enable = lib.mkEnableOption "enable Chloe's website in integration"; |
11 | 11 | ||
12 | config = lib.mkIf cfg.enable { | 12 | config = lib.mkIf cfg.enable { |
13 | services.duplyBackup.profiles.chloe_integration.rootDir = app.varDir; | ||
14 | secrets.keys."websites/chloe/integration" = { | 13 | secrets.keys."websites/chloe/integration" = { |
15 | user = apacheUser; | 14 | user = apacheUser; |
16 | group = apacheGroup; | 15 | group = apacheGroup; |
diff --git a/modules/private/websites/chloe/production.nix b/modules/private/websites/chloe/production.nix index c3a5732..211232c 100644 --- a/modules/private/websites/chloe/production.nix +++ b/modules/private/websites/chloe/production.nix | |||
@@ -13,8 +13,6 @@ in { | |||
13 | options.myServices.websites.chloe.production.enable = lib.mkEnableOption "enable Chloe's website in production"; | 13 | options.myServices.websites.chloe.production.enable = lib.mkEnableOption "enable Chloe's website in production"; |
14 | 14 | ||
15 | config = lib.mkIf cfg.enable { | 15 | config = lib.mkIf cfg.enable { |
16 | services.duplyBackup.profiles.chloe_production.rootDir = app.varDir; | ||
17 | services.duplyBackup.profiles.chloe_production.remotes = ["eriomem" "ovh"]; | ||
18 | secrets.keys."websites/chloe/production" = { | 16 | secrets.keys."websites/chloe/production" = { |
19 | user = apacheUser; | 17 | user = apacheUser; |
20 | group = apacheGroup; | 18 | group = apacheGroup; |
diff --git a/modules/private/websites/connexionswing/integration.nix b/modules/private/websites/connexionswing/integration.nix index fe0e4d9..c1165b8 100644 --- a/modules/private/websites/connexionswing/integration.nix +++ b/modules/private/websites/connexionswing/integration.nix | |||
@@ -9,7 +9,6 @@ in { | |||
9 | options.myServices.websites.connexionswing.integration.enable = lib.mkEnableOption "enable Connexionswing's website in integration"; | 9 | options.myServices.websites.connexionswing.integration.enable = lib.mkEnableOption "enable Connexionswing's website in integration"; |
10 | 10 | ||
11 | config = lib.mkIf cfg.enable { | 11 | config = lib.mkIf cfg.enable { |
12 | services.duplyBackup.profiles.connexionswing_integration.rootDir = app.varDir; | ||
13 | services.phpApplication.apps.connexionswing_integration = { | 12 | services.phpApplication.apps.connexionswing_integration = { |
14 | websiteEnv = "integration"; | 13 | websiteEnv = "integration"; |
15 | 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 144093a..4b0407f 100644 --- a/modules/private/websites/connexionswing/production.nix +++ b/modules/private/websites/connexionswing/production.nix | |||
@@ -13,8 +13,6 @@ in { | |||
13 | options.myServices.websites.connexionswing.production.enable = lib.mkEnableOption "enable Connexionswing's website in production"; | 13 | options.myServices.websites.connexionswing.production.enable = lib.mkEnableOption "enable Connexionswing's website in production"; |
14 | 14 | ||
15 | config = lib.mkIf cfg.enable { | 15 | config = lib.mkIf cfg.enable { |
16 | services.duplyBackup.profiles.connexionswing_production.rootDir = app.varDir; | ||
17 | services.duplyBackup.profiles.connexionswing_production.remotes = ["eriomem" "ovh"]; | ||
18 | services.webstats.sites = [ { name = "connexionswing.com"; } ]; | 16 | services.webstats.sites = [ { name = "connexionswing.com"; } ]; |
19 | services.phpApplication.apps.connexionswing_production = { | 17 | services.phpApplication.apps.connexionswing_production = { |
20 | websiteEnv = "production"; | 18 | websiteEnv = "production"; |
diff --git a/modules/private/websites/default.nix b/modules/private/websites/default.nix index 08c9d79..7aac7b8 100644 --- a/modules/private/websites/default.nix +++ b/modules/private/websites/default.nix | |||
@@ -102,10 +102,6 @@ in | |||
102 | options.myServices.websites.enable = lib.mkEnableOption "enable websites"; | 102 | options.myServices.websites.enable = lib.mkEnableOption "enable websites"; |
103 | 103 | ||
104 | config = lib.mkIf config.myServices.websites.enable { | 104 | config = lib.mkIf config.myServices.websites.enable { |
105 | services.duplyBackup.profiles.php = { | ||
106 | rootDir = "/var/lib/php"; | ||
107 | remotes = [ "eriomem" "ovh" ]; | ||
108 | }; | ||
109 | users.users.wwwrun.extraGroups = [ "keys" ]; | 105 | users.users.wwwrun.extraGroups = [ "keys" ]; |
110 | networking.firewall.allowedTCPPorts = [ 80 443 ]; | 106 | networking.firewall.allowedTCPPorts = [ 80 443 ]; |
111 | 107 | ||
diff --git a/modules/private/websites/emilia/moodle.nix b/modules/private/websites/emilia/moodle.nix index f943502..779c460 100644 --- a/modules/private/websites/emilia/moodle.nix +++ b/modules/private/websites/emilia/moodle.nix | |||
@@ -43,7 +43,6 @@ in { | |||
43 | options.myServices.websites.emilia.moodle.enable = lib.mkEnableOption "enable Emilia's website"; | 43 | options.myServices.websites.emilia.moodle.enable = lib.mkEnableOption "enable Emilia's website"; |
44 | 44 | ||
45 | config = lib.mkIf cfg.enable { | 45 | config = lib.mkIf cfg.enable { |
46 | services.duplyBackup.profiles.emilia_moodle.rootDir = varDir; | ||
47 | system.activationScripts.emilia_moodle = '' | 46 | system.activationScripts.emilia_moodle = '' |
48 | install -m 0755 -o ${apacheUser} -g ${apacheGroup} -d ${varDir} | 47 | install -m 0755 -o ${apacheUser} -g ${apacheGroup} -d ${varDir} |
49 | ''; | 48 | ''; |
diff --git a/modules/private/websites/florian/app.nix b/modules/private/websites/florian/app.nix index 27810a5..2df344f 100644 --- a/modules/private/websites/florian/app.nix +++ b/modules/private/websites/florian/app.nix | |||
@@ -9,7 +9,6 @@ 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.duplyBackup.profiles.florian_app.rootDir = app.varDir; | ||
13 | services.phpApplication.apps.florian_app = { | 12 | services.phpApplication.apps.florian_app = { |
14 | websiteEnv = "integration"; | 13 | websiteEnv = "integration"; |
15 | httpdUser = config.services.httpd.Inte.user; | 14 | httpdUser = config.services.httpd.Inte.user; |
diff --git a/modules/private/websites/immae/temp.nix b/modules/private/websites/immae/temp.nix index 61ed9cf..19aef1a 100644 --- a/modules/private/websites/immae/temp.nix +++ b/modules/private/websites/immae/temp.nix | |||
@@ -7,8 +7,6 @@ in { | |||
7 | options.myServices.websites.immae.temp.enable = lib.mkEnableOption "enable Temp' website"; | 7 | options.myServices.websites.immae.temp.enable = lib.mkEnableOption "enable Temp' website"; |
8 | 8 | ||
9 | config = lib.mkIf cfg.enable { | 9 | config = lib.mkIf cfg.enable { |
10 | services.duplyBackup.profiles.immae_temp.rootDir = varDir; | ||
11 | services.duplyBackup.profiles.immae_temp_surfer.rootDir = "/var/lib/surfer"; | ||
12 | services.websites.env.production.vhostConfs.immae_temp = { | 10 | services.websites.env.production.vhostConfs.immae_temp = { |
13 | certName = "immae"; | 11 | certName = "immae"; |
14 | addToCerts = true; | 12 | addToCerts = true; |
diff --git a/modules/private/websites/isabelle/aten_integration.nix b/modules/private/websites/isabelle/aten_integration.nix index 288f20d..215038e 100644 --- a/modules/private/websites/isabelle/aten_integration.nix +++ b/modules/private/websites/isabelle/aten_integration.nix | |||
@@ -8,7 +8,6 @@ in { | |||
8 | options.myServices.websites.isabelle.aten_integration.enable = lib.mkEnableOption "enable Aten's website in integration"; | 8 | options.myServices.websites.isabelle.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.duplyBackup.profiles.isabelle_aten_integration.rootDir = app.varDir; | ||
12 | services.phpApplication.apps.isabelle_aten_integration = { | 11 | services.phpApplication.apps.isabelle_aten_integration = { |
13 | websiteEnv = "integration"; | 12 | websiteEnv = "integration"; |
14 | httpdUser = config.services.httpd.Inte.user; | 13 | httpdUser = config.services.httpd.Inte.user; |
diff --git a/modules/private/websites/isabelle/aten_production.nix b/modules/private/websites/isabelle/aten_production.nix index 6a04710..928a815 100644 --- a/modules/private/websites/isabelle/aten_production.nix +++ b/modules/private/websites/isabelle/aten_production.nix | |||
@@ -12,8 +12,6 @@ in { | |||
12 | options.myServices.websites.isabelle.aten_production.enable = lib.mkEnableOption "enable Aten's website in production"; | 12 | options.myServices.websites.isabelle.aten_production.enable = lib.mkEnableOption "enable Aten's website in production"; |
13 | 13 | ||
14 | config = lib.mkIf cfg.enable { | 14 | config = lib.mkIf cfg.enable { |
15 | services.duplyBackup.profiles.isabelle_aten_production.rootDir = app.varDir; | ||
16 | services.duplyBackup.profiles.isabelle_aten_production.remotes = ["eriomem" "ovh"]; | ||
17 | services.webstats.sites = [ { name = "aten.pro"; } ]; | 15 | services.webstats.sites = [ { name = "aten.pro"; } ]; |
18 | services.phpApplication.apps.isabelle_aten_production = { | 16 | services.phpApplication.apps.isabelle_aten_production = { |
19 | websiteEnv = "production"; | 17 | websiteEnv = "production"; |
diff --git a/modules/private/websites/isabelle/iridologie.nix b/modules/private/websites/isabelle/iridologie.nix index 88521fc..cd733c1 100644 --- a/modules/private/websites/isabelle/iridologie.nix +++ b/modules/private/websites/isabelle/iridologie.nix | |||
@@ -15,8 +15,6 @@ in { | |||
15 | options.myServices.websites.isabelle.iridologie.enable = lib.mkEnableOption "enable Iridologie's website"; | 15 | options.myServices.websites.isabelle.iridologie.enable = lib.mkEnableOption "enable Iridologie's website"; |
16 | 16 | ||
17 | config = lib.mkIf cfg.enable { | 17 | config = lib.mkIf cfg.enable { |
18 | services.duplyBackup.profiles.isabelle_iridologie.rootDir = app.varDir; | ||
19 | services.duplyBackup.profiles.isabelle_iridologie.remotes = ["eriomem" "ovh"]; | ||
20 | secrets.keys."websites/isabelle/iridologie" = { | 18 | secrets.keys."websites/isabelle/iridologie" = { |
21 | user = apacheUser; | 19 | user = apacheUser; |
22 | group = apacheGroup; | 20 | group = apacheGroup; |
diff --git a/modules/private/websites/ludivine/integration.nix b/modules/private/websites/ludivine/integration.nix index d04295d..c0cbbef 100644 --- a/modules/private/websites/ludivine/integration.nix +++ b/modules/private/websites/ludivine/integration.nix | |||
@@ -8,7 +8,6 @@ in { | |||
8 | options.myServices.websites.ludivine.integration.enable = lib.mkEnableOption "enable Ludivine's website in integration"; | 8 | options.myServices.websites.ludivine.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.duplyBackup.profiles.ludivine_integration.rootDir = app.varDir; | ||
12 | services.phpApplication.apps.ludivine_integration = { | 11 | services.phpApplication.apps.ludivine_integration = { |
13 | websiteEnv = "integration"; | 12 | websiteEnv = "integration"; |
14 | httpdUser = config.services.httpd.Inte.user; | 13 | httpdUser = config.services.httpd.Inte.user; |
diff --git a/modules/private/websites/ludivine/production.nix b/modules/private/websites/ludivine/production.nix index 09bb3dc..7a18b88 100644 --- a/modules/private/websites/ludivine/production.nix +++ b/modules/private/websites/ludivine/production.nix | |||
@@ -13,8 +13,6 @@ in { | |||
13 | options.myServices.websites.ludivine.production.enable = lib.mkEnableOption "enable Ludivine's website in production"; | 13 | options.myServices.websites.ludivine.production.enable = lib.mkEnableOption "enable Ludivine's website in production"; |
14 | 14 | ||
15 | config = lib.mkIf cfg.enable { | 15 | config = lib.mkIf cfg.enable { |
16 | services.duplyBackup.profiles.ludivine_production.rootDir = app.varDir; | ||
17 | services.duplyBackup.profiles.ludivine_production.remotes = ["eriomem" "ovh"]; | ||
18 | services.webstats.sites = [ { name = "ludivinecassal.com"; } ]; | 16 | services.webstats.sites = [ { name = "ludivinecassal.com"; } ]; |
19 | services.phpApplication.apps.ludivine_production = { | 17 | services.phpApplication.apps.ludivine_production = { |
20 | websiteEnv = "production"; | 18 | websiteEnv = "production"; |
diff --git a/modules/private/websites/piedsjaloux/integration.nix b/modules/private/websites/piedsjaloux/integration.nix index 64d577e..d103ad7 100644 --- a/modules/private/websites/piedsjaloux/integration.nix +++ b/modules/private/websites/piedsjaloux/integration.nix | |||
@@ -9,7 +9,6 @@ in { | |||
9 | options.myServices.websites.piedsjaloux.integration.enable = lib.mkEnableOption "enable PiedsJaloux's website in integration"; | 9 | options.myServices.websites.piedsjaloux.integration.enable = lib.mkEnableOption "enable PiedsJaloux's website in integration"; |
10 | 10 | ||
11 | config = lib.mkIf cfg.enable { | 11 | config = lib.mkIf cfg.enable { |
12 | services.duplyBackup.profiles.piedsjaloux_integration.rootDir = app.varDir; | ||
13 | services.phpApplication.apps.piedsjaloux_integration = { | 12 | services.phpApplication.apps.piedsjaloux_integration = { |
14 | websiteEnv = "integration"; | 13 | websiteEnv = "integration"; |
15 | 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 118846d..422c7f0 100644 --- a/modules/private/websites/piedsjaloux/production.nix +++ b/modules/private/websites/piedsjaloux/production.nix | |||
@@ -14,8 +14,6 @@ in { | |||
14 | options.myServices.websites.piedsjaloux.production.enable = lib.mkEnableOption "enable PiedsJaloux's website in production"; | 14 | options.myServices.websites.piedsjaloux.production.enable = lib.mkEnableOption "enable PiedsJaloux's website in production"; |
15 | 15 | ||
16 | config = lib.mkIf cfg.enable { | 16 | config = lib.mkIf cfg.enable { |
17 | services.duplyBackup.profiles.piedsjaloux_production.rootDir = app.varDir; | ||
18 | services.duplyBackup.profiles.piedsjaloux_production.remotes = ["eriomem" "ovh"]; | ||
19 | services.webstats.sites = [ { name = "piedsjaloux.fr"; } ]; | 17 | services.webstats.sites = [ { name = "piedsjaloux.fr"; } ]; |
20 | services.phpApplication.apps.piedsjaloux_production = { | 18 | services.phpApplication.apps.piedsjaloux_production = { |
21 | websiteEnv = "production"; | 19 | websiteEnv = "production"; |
diff --git a/modules/private/websites/richie/production.nix b/modules/private/websites/richie/production.nix index e95df30..a548cff 100644 --- a/modules/private/websites/richie/production.nix +++ b/modules/private/websites/richie/production.nix | |||
@@ -24,8 +24,6 @@ in | |||
24 | { | 24 | { |
25 | options.myServices.websites.richie.production.enable = lib.mkEnableOption "enable Richie's website"; | 25 | options.myServices.websites.richie.production.enable = lib.mkEnableOption "enable Richie's website"; |
26 | config = lib.mkIf cfg.enable { | 26 | config = lib.mkIf cfg.enable { |
27 | services.duplyBackup.profiles.richie_production.rootDir = vardir; | ||
28 | services.duplyBackup.profiles.richie_production.remotes = ["eriomem" "ovh"]; | ||
29 | services.webstats.sites = [ { name = "europe-richie.org"; } ]; | 27 | services.webstats.sites = [ { name = "europe-richie.org"; } ]; |
30 | 28 | ||
31 | secrets.keys."websites/richie/production" = { | 29 | secrets.keys."websites/richie/production" = { |
diff --git a/modules/private/websites/syden/peertube.nix b/modules/private/websites/syden/peertube.nix index 4036eac..64d4a5d 100644 --- a/modules/private/websites/syden/peertube.nix +++ b/modules/private/websites/syden/peertube.nix | |||
@@ -10,10 +10,6 @@ in | |||
10 | options.myServices.websites.syden.peertube.enable = lib.mkEnableOption "enable Syden's website"; | 10 | options.myServices.websites.syden.peertube.enable = lib.mkEnableOption "enable Syden's website"; |
11 | 11 | ||
12 | config = lib.mkIf scfg.enable { | 12 | config = lib.mkIf scfg.enable { |
13 | services.duplyBackup.profiles.syden_peertube = { | ||
14 | rootDir = dataDir; | ||
15 | remotes = ["eriomem" "ovh"]; | ||
16 | }; | ||
17 | users.users.peertube = { | 13 | users.users.peertube = { |
18 | uid = config.ids.uids.peertube; | 14 | uid = config.ids.uids.peertube; |
19 | group = "peertube"; | 15 | group = "peertube"; |
diff --git a/modules/private/websites/tools/diaspora/default.nix b/modules/private/websites/tools/diaspora/default.nix index 9afd5b9..3a115ed 100644 --- a/modules/private/websites/tools/diaspora/default.nix +++ b/modules/private/websites/tools/diaspora/default.nix | |||
@@ -10,10 +10,6 @@ in { | |||
10 | }; | 10 | }; |
11 | 11 | ||
12 | config = lib.mkIf cfg.enable { | 12 | config = lib.mkIf cfg.enable { |
13 | services.duplyBackup.profiles.diaspora = { | ||
14 | rootDir = dcfg.dataDir; | ||
15 | remotes = [ "eriomem" "ovh" ]; | ||
16 | }; | ||
17 | users.users.diaspora.extraGroups = [ "keys" ]; | 13 | users.users.diaspora.extraGroups = [ "keys" ]; |
18 | 14 | ||
19 | secrets.keys = { | 15 | secrets.keys = { |
diff --git a/modules/private/websites/tools/ether/default.nix b/modules/private/websites/tools/ether/default.nix index d5c65a9..0539095 100644 --- a/modules/private/websites/tools/ether/default.nix +++ b/modules/private/websites/tools/ether/default.nix | |||
@@ -12,9 +12,6 @@ in { | |||
12 | }; | 12 | }; |
13 | 13 | ||
14 | config = lib.mkIf cfg.enable { | 14 | config = lib.mkIf cfg.enable { |
15 | services.duplyBackup.profiles.etherpad-lite = { | ||
16 | rootDir = "/var/lib/private/etherpad-lite"; | ||
17 | }; | ||
18 | secrets.keys = { | 15 | secrets.keys = { |
19 | "webapps/tools-etherpad-apikey" = { | 16 | "webapps/tools-etherpad-apikey" = { |
20 | permissions = "0400"; | 17 | permissions = "0400"; |
diff --git a/modules/private/websites/tools/mail/default.nix b/modules/private/websites/tools/mail/default.nix index 7bc3d2d..390f7ad 100644 --- a/modules/private/websites/tools/mail/default.nix +++ b/modules/private/websites/tools/mail/default.nix | |||
@@ -21,10 +21,6 @@ in | |||
21 | ]; | 21 | ]; |
22 | 22 | ||
23 | config = lib.mkIf cfg.enable { | 23 | config = lib.mkIf cfg.enable { |
24 | services.duplyBackup.profiles.mail.excludeFile = '' | ||
25 | + ${rainloop.varDir} | ||
26 | + ${roundcubemail.varDir} | ||
27 | ''; | ||
28 | secrets.keys = roundcubemail.keys; | 24 | secrets.keys = roundcubemail.keys; |
29 | 25 | ||
30 | services.websites.env.tools.modules = | 26 | services.websites.env.tools.modules = |
diff --git a/modules/private/websites/tools/mastodon/default.nix b/modules/private/websites/tools/mastodon/default.nix index 3512cf1..173a4b8 100644 --- a/modules/private/websites/tools/mastodon/default.nix +++ b/modules/private/websites/tools/mastodon/default.nix | |||
@@ -10,9 +10,6 @@ in { | |||
10 | }; | 10 | }; |
11 | 11 | ||
12 | config = lib.mkIf cfg.enable { | 12 | config = lib.mkIf cfg.enable { |
13 | services.duplyBackup.profiles.mastodon = { | ||
14 | rootDir = mcfg.dataDir; | ||
15 | }; | ||
16 | secrets.keys."webapps/tools-mastodon" = { | 13 | secrets.keys."webapps/tools-mastodon" = { |
17 | user = "mastodon"; | 14 | user = "mastodon"; |
18 | group = "mastodon"; | 15 | group = "mastodon"; |
diff --git a/modules/private/websites/tools/mgoblin/default.nix b/modules/private/websites/tools/mgoblin/default.nix index f6cba4a..1e5f5a0 100644 --- a/modules/private/websites/tools/mgoblin/default.nix +++ b/modules/private/websites/tools/mgoblin/default.nix | |||
@@ -9,9 +9,6 @@ in { | |||
9 | }; | 9 | }; |
10 | 10 | ||
11 | config = lib.mkIf cfg.enable { | 11 | config = lib.mkIf cfg.enable { |
12 | services.duplyBackup.profiles.mgoblin = { | ||
13 | rootDir = mcfg.dataDir; | ||
14 | }; | ||
15 | secrets.keys."webapps/tools-mediagoblin" = { | 12 | secrets.keys."webapps/tools-mediagoblin" = { |
16 | user = "mediagoblin"; | 13 | user = "mediagoblin"; |
17 | group = "mediagoblin"; | 14 | group = "mediagoblin"; |
diff --git a/modules/private/websites/tools/peertube/default.nix b/modules/private/websites/tools/peertube/default.nix index daeeb1f..68c992f 100644 --- a/modules/private/websites/tools/peertube/default.nix +++ b/modules/private/websites/tools/peertube/default.nix | |||
@@ -9,9 +9,6 @@ in { | |||
9 | }; | 9 | }; |
10 | 10 | ||
11 | config = lib.mkIf cfg.enable { | 11 | config = lib.mkIf cfg.enable { |
12 | services.duplyBackup.profiles.peertube = { | ||
13 | rootDir = pcfg.dataDir; | ||
14 | }; | ||
15 | services.peertube = { | 12 | services.peertube = { |
16 | enable = true; | 13 | enable = true; |
17 | configFile = config.secrets.fullPaths."webapps/tools-peertube"; | 14 | configFile = config.secrets.fullPaths."webapps/tools-peertube"; |
diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix index 9052473..77d6323 100644 --- a/modules/private/websites/tools/tools/default.nix +++ b/modules/private/websites/tools/tools/default.nix | |||
@@ -90,17 +90,6 @@ in { | |||
90 | // csp-reports.keys | 90 | // csp-reports.keys |
91 | // webhooks.keys; | 91 | // webhooks.keys; |
92 | 92 | ||
93 | services.duplyBackup.profiles = { | ||
94 | dokuwiki = dokuwiki.backups; | ||
95 | grocy = grocy.backups; | ||
96 | kanboard = kanboard.backups; | ||
97 | rompr = rompr.backups; | ||
98 | shaarli = shaarli.backups; | ||
99 | ttrss = ttrss.backups; | ||
100 | wallabag = wallabag.backups; | ||
101 | phpbb = phpbb.backups; | ||
102 | }; | ||
103 | |||
104 | services.websites.env.tools.modules = | 93 | services.websites.env.tools.modules = |
105 | [ "proxy_fcgi" ] | 94 | [ "proxy_fcgi" ] |
106 | ++ adminer.apache.modules | 95 | ++ adminer.apache.modules |
diff --git a/modules/private/websites/tools/tools/dokuwiki.nix b/modules/private/websites/tools/tools/dokuwiki.nix index 1bcd852..aee495a 100644 --- a/modules/private/websites/tools/tools/dokuwiki.nix +++ b/modules/private/websites/tools/tools/dokuwiki.nix | |||
@@ -1,9 +1,5 @@ | |||
1 | { lib, stdenv, dokuwiki, dokuwiki-plugins }: | 1 | { lib, stdenv, dokuwiki, dokuwiki-plugins }: |
2 | rec { | 2 | rec { |
3 | backups = { | ||
4 | rootDir = varDir; | ||
5 | remotes = [ "eriomem" "ovh" ]; | ||
6 | }; | ||
7 | varDir = "/var/lib/dokuwiki"; | 3 | varDir = "/var/lib/dokuwiki"; |
8 | activationScript = { | 4 | activationScript = { |
9 | deps = [ "wrappers" ]; | 5 | deps = [ "wrappers" ]; |
diff --git a/modules/private/websites/tools/tools/grocy.nix b/modules/private/websites/tools/tools/grocy.nix index 3c33170..3c45261 100644 --- a/modules/private/websites/tools/tools/grocy.nix +++ b/modules/private/websites/tools/tools/grocy.nix | |||
@@ -1,8 +1,5 @@ | |||
1 | { lib, stdenv, grocy }: | 1 | { lib, stdenv, grocy }: |
2 | rec { | 2 | rec { |
3 | backups = { | ||
4 | rootDir = varDir; | ||
5 | }; | ||
6 | varDir = "/var/lib/grocy"; | 3 | varDir = "/var/lib/grocy"; |
7 | activationScript = { | 4 | activationScript = { |
8 | deps = [ "wrappers" ]; | 5 | deps = [ "wrappers" ]; |
diff --git a/modules/private/websites/tools/tools/kanboard.nix b/modules/private/websites/tools/tools/kanboard.nix index 54bbe01..4809a42 100644 --- a/modules/private/websites/tools/tools/kanboard.nix +++ b/modules/private/websites/tools/tools/kanboard.nix | |||
@@ -1,8 +1,5 @@ | |||
1 | { env, kanboard, config }: | 1 | { env, kanboard, config }: |
2 | rec { | 2 | rec { |
3 | backups = { | ||
4 | rootDir = varDir; | ||
5 | }; | ||
6 | varDir = "/var/lib/kanboard"; | 3 | varDir = "/var/lib/kanboard"; |
7 | activationScript = { | 4 | activationScript = { |
8 | deps = [ "wrappers" ]; | 5 | deps = [ "wrappers" ]; |
diff --git a/modules/private/websites/tools/tools/phpbb.nix b/modules/private/websites/tools/tools/phpbb.nix index e341a64..77845c3 100644 --- a/modules/private/websites/tools/tools/phpbb.nix +++ b/modules/private/websites/tools/tools/phpbb.nix | |||
@@ -1,8 +1,5 @@ | |||
1 | { lib, phpbb, gnused }: | 1 | { lib, phpbb, gnused }: |
2 | rec { | 2 | rec { |
3 | backups = { | ||
4 | rootDir = varDir; | ||
5 | }; | ||
6 | varDir = "/var/lib/phpbb"; | 3 | varDir = "/var/lib/phpbb"; |
7 | activationScript = { | 4 | activationScript = { |
8 | deps = [ "wrappers" ]; | 5 | deps = [ "wrappers" ]; |
diff --git a/modules/private/websites/tools/tools/rompr.nix b/modules/private/websites/tools/tools/rompr.nix index 9765df5..e80d6b2 100644 --- a/modules/private/websites/tools/tools/rompr.nix +++ b/modules/private/websites/tools/tools/rompr.nix | |||
@@ -1,8 +1,5 @@ | |||
1 | { lib, env, rompr }: | 1 | { lib, env, rompr }: |
2 | rec { | 2 | rec { |
3 | backups = { | ||
4 | rootDir = varDir; | ||
5 | }; | ||
6 | varDir = "/var/lib/rompr"; | 3 | varDir = "/var/lib/rompr"; |
7 | activationScript = '' | 4 | activationScript = '' |
8 | install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} \ | 5 | install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} \ |
diff --git a/modules/private/websites/tools/tools/shaarli.nix b/modules/private/websites/tools/tools/shaarli.nix index f63c722..d128465 100644 --- a/modules/private/websites/tools/tools/shaarli.nix +++ b/modules/private/websites/tools/tools/shaarli.nix | |||
@@ -2,10 +2,6 @@ | |||
2 | let | 2 | let |
3 | varDir = "/var/lib/shaarli"; | 3 | varDir = "/var/lib/shaarli"; |
4 | in rec { | 4 | in rec { |
5 | backups = { | ||
6 | rootDir = varDir; | ||
7 | remotes = [ "eriomem" "ovh" ]; | ||
8 | }; | ||
9 | activationScript = '' | 5 | activationScript = '' |
10 | install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} \ | 6 | install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} \ |
11 | ${varDir}/cache ${varDir}/pagecache ${varDir}/tmp ${varDir}/data \ | 7 | ${varDir}/cache ${varDir}/pagecache ${varDir}/tmp ${varDir}/data \ |
diff --git a/modules/private/websites/tools/tools/ttrss.nix b/modules/private/websites/tools/tools/ttrss.nix index bee26c8..1dc99ed 100644 --- a/modules/private/websites/tools/tools/ttrss.nix +++ b/modules/private/websites/tools/tools/ttrss.nix | |||
@@ -1,8 +1,5 @@ | |||
1 | { php, env, ttrss, ttrss-plugins, config }: | 1 | { php, env, ttrss, ttrss-plugins, config }: |
2 | rec { | 2 | rec { |
3 | backups = { | ||
4 | rootDir = varDir; | ||
5 | }; | ||
6 | varDir = "/var/lib/ttrss"; | 3 | varDir = "/var/lib/ttrss"; |
7 | activationScript = { | 4 | activationScript = { |
8 | deps = [ "wrappers" ]; | 5 | deps = [ "wrappers" ]; |
diff --git a/modules/private/websites/tools/tools/wallabag.nix b/modules/private/websites/tools/tools/wallabag.nix index ceb061f..0ebdb0b 100644 --- a/modules/private/websites/tools/tools/wallabag.nix +++ b/modules/private/websites/tools/tools/wallabag.nix | |||
@@ -1,9 +1,5 @@ | |||
1 | { env, wallabag, mylibs, config }: | 1 | { env, wallabag, mylibs, config }: |
2 | rec { | 2 | rec { |
3 | backups = { | ||
4 | rootDir = varDir; | ||
5 | remotes = [ "eriomem" "ovh" ]; | ||
6 | }; | ||
7 | varDir = "/var/lib/wallabag"; | 3 | varDir = "/var/lib/wallabag"; |
8 | keys."webapps/tools-wallabag" = { | 4 | keys."webapps/tools-wallabag" = { |
9 | user = apache.user; | 5 | user = apache.user; |
diff --git a/modules/webapps/webstats/default.nix b/modules/webapps/webstats/default.nix index 7a27741..e873af2 100644 --- a/modules/webapps/webstats/default.nix +++ b/modules/webapps/webstats/default.nix | |||
@@ -37,9 +37,6 @@ 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.duplyBackup.profiles.goaccess = { | ||
41 | rootDir = cfg.dataDir; | ||
42 | }; | ||
43 | users.users.root.packages = [ | 40 | users.users.root.packages = [ |
44 | pkgs.goaccess | 41 | pkgs.goaccess |
45 | ]; | 42 | ]; |