From 5315b439af1f72c3282549508ae58d86d66e38ec Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Fri, 22 Oct 2021 20:55:31 +0200 Subject: [PATCH] Remove duply-backup --- modules/private/buildbot/default.nix | 4 --- modules/private/certificates.nix | 3 --- modules/private/ftp.nix | 4 --- modules/private/gitolite/default.nix | 4 --- modules/private/irc.nix | 3 --- modules/private/mail/default.nix | 10 -------- modules/private/mail/dovecot.nix | 4 --- modules/private/mail/postfix.nix | 3 --- modules/private/mail/rspamd.nix | 3 --- modules/private/mail/sympa.nix | 3 --- modules/private/monitoring/default.nix | 3 --- .../monitoring/objects_monitoring-1.nix | 25 +------------------ modules/private/mpd.nix | 3 --- modules/private/pub/default.nix | 4 --- modules/private/system.nix | 11 -------- modules/private/system/eldiron.nix | 2 -- modules/private/tasks/default.nix | 9 ------- .../private/websites/chloe/integration.nix | 1 - modules/private/websites/chloe/production.nix | 2 -- .../websites/connexionswing/integration.nix | 1 - .../websites/connexionswing/production.nix | 2 -- modules/private/websites/default.nix | 4 --- modules/private/websites/emilia/moodle.nix | 1 - modules/private/websites/florian/app.nix | 1 - modules/private/websites/immae/temp.nix | 2 -- .../websites/isabelle/aten_integration.nix | 1 - .../websites/isabelle/aten_production.nix | 2 -- .../private/websites/isabelle/iridologie.nix | 2 -- .../private/websites/ludivine/integration.nix | 1 - .../private/websites/ludivine/production.nix | 2 -- .../websites/piedsjaloux/integration.nix | 1 - .../websites/piedsjaloux/production.nix | 2 -- .../private/websites/richie/production.nix | 2 -- modules/private/websites/syden/peertube.nix | 4 --- .../websites/tools/diaspora/default.nix | 4 --- .../private/websites/tools/ether/default.nix | 3 --- .../private/websites/tools/mail/default.nix | 4 --- .../websites/tools/mastodon/default.nix | 3 --- .../websites/tools/mgoblin/default.nix | 3 --- .../websites/tools/peertube/default.nix | 3 --- .../private/websites/tools/tools/default.nix | 11 -------- .../private/websites/tools/tools/dokuwiki.nix | 4 --- .../private/websites/tools/tools/grocy.nix | 3 --- .../private/websites/tools/tools/kanboard.nix | 3 --- .../private/websites/tools/tools/phpbb.nix | 3 --- .../private/websites/tools/tools/rompr.nix | 3 --- .../private/websites/tools/tools/shaarli.nix | 4 --- .../private/websites/tools/tools/ttrss.nix | 3 --- .../private/websites/tools/tools/wallabag.nix | 4 --- modules/webapps/webstats/default.nix | 3 --- 50 files changed, 1 insertion(+), 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 }; config = lib.mkIf config.myServices.buildbot.enable { - services.duplyBackup.profiles.buildbot = { - rootDir = varDir; - remotes = [ "eriomem" "ovh" ]; - }; ids.uids.buildbot = config.myEnv.buildbot.user.uid; ids.gids.buildbot = config.myEnv.buildbot.user.gid; 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 @@ }; config = lib.mkIf config.myServices.certificates.enable { - services.duplyBackup.profiles.system.excludeFile = '' - + ${config.myServices.certificates.webroot} - ''; services.nginx = { recommendedTlsSettings = true; 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 }; config = lib.mkIf config.myServices.ftp.enable { - services.duplyBackup.profiles.ftp = { - rootDir = "/var/lib/ftp"; - remotes = [ "eriomem" "ovh" ]; - }; security.acme.certs."ftp" = config.myServices.certificates.certConfig // { domain = "eldiron.immae.eu"; 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 { snippet = builtins.readFile ./ldap_gitolite.sh; dependencies = [ pkgs.gitolite ]; }]; - services.duplyBackup.profiles.gitolite = { - rootDir = cfg.gitoliteDir; - remotes = [ "eriomem" "ovh" ]; - }; networking.firewall.allowedTCPPorts = [ 9418 ]; 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 }; config = lib.mkIf cfg.enable { - services.duplyBackup.profiles.irc = { - rootDir = "/var/lib/bitlbee"; - }; security.acme.certs."irc" = config.myServices.ircCerts // { domain = "irc.immae.eu"; 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 @@ mxs = map (zone: "${config.hostEnv.mx.subdomain}.${zone.name}") zonesWithMx; in builtins.listToAttrs (map (mx: lib.attrsets.nameValuePair mx null) mxs); }; - services.duplyBackup.profiles = { - mail = { - remotes = [ "eriomem" "ovh" ]; - rootDir = "/var/lib"; - excludeFile = lib.mkAfter '' - + /var/lib/vhost - - /var/lib - ''; - }; - }; systemd.slices.mail = { description = "Mail slice"; }; 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 { config = lib.mkIf config.myServices.mail.enable { systemd.services.dovecot2.serviceConfig.Slice = "mail.slice"; - services.duplyBackup.profiles.mail.excludeFile = '' - + /var/lib/dhparams - + /var/lib/dovecot - ''; secrets.keys."dovecot/ldap" = { user = config.services.dovecot2.user; 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 @@ { lib, pkgs, config, nodes, ... }: { config = lib.mkIf config.myServices.mail.enable { - services.duplyBackup.profiles.mail.excludeFile = '' - + /var/lib/postfix - ''; secrets.keys = { "postfix/mysql_alias_maps" = { 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 @@ ''; }; config = lib.mkIf config.myServices.mail.enable { - services.duplyBackup.profiles.mail.excludeFile = '' - + /var/lib/rspamd - ''; services.cron.systemCronJobs = let cron_script = pkgs.runCommand "cron_script" { 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 } ]; }; - services.duplyBackup.profiles.sympa = { - rootDir = "/var/lib/sympa"; - }; services.websites.env.tools.vhostConfs.mail = { extraConfig = lib.mkAfter [ '' 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 }; }; - services.duplyBackup.profiles.monitoring = { - rootDir = config.services.naemon.varDir; - }; security.sudo.extraRules = let pluginsSudo = lib.lists.remove null (lib.attrsets.mapAttrsToList (k: v: 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 @@ { config, pkgs, nodes, hostFQDN, emailCheck, lib, ... }: -let - to_resource = func: cfg: lib.flatten (lib.optionals cfg.enable (lib.mapAttrsToList func cfg.profiles)); - to_backup_age_dependency = name: profile: map (remote: - { - dependent_host_name = "eldiron.immae.eu"; - host_name = "eldiron.immae.eu"; - dependent_service_description = "${remote} backup for ${name} is not too old"; - service_description = "${remote} backup is up and not full"; - execution_failure_criteria = "u"; - notification_failure_criteria = "u"; - }) profile.remotes; - to_backup_age = name: profile: map (remote: - { - service_description = "${remote} backup for ${name} is not too old"; - host_name = "eldiron.immae.eu"; - use = "external-service"; - check_command = ["check_backup_${remote}_age" name]; - - check_interval = "120"; - notification_interval = "1440"; - }) profile.remotes; -in { activatedPlugins = [ "dns" "ftp" "git" "http" "imap" "ovh" "tcp" ]; host = { @@ -718,7 +696,7 @@ in check_command = [ "check_https" "origny.tiboqorl.fr" "/" "Home Assistant" ]; _webstatus_namespace = "tiboqorl"; } - ] ++ to_resource to_backup_age nodes.eldiron.config.services.duplyBackup; + ]; contact = { telio-tortay = config.myEnv.monitoring.contacts.telio-tortay // { use = "generic-contact"; @@ -733,5 +711,4 @@ in telio-tortay = { alias = "Telio Tortay"; members = "immae"; }; tiboqorl = { alias = "Tiboqorl"; members = "immae"; }; }; - servicedependency = to_resource to_backup_age_dependency nodes.eldiron.config.services.duplyBackup; } 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 @@ { options.myServices.mpd.enable = lib.mkEnableOption "enable MPD"; config = lib.mkIf config.myServices.mpd.enable { - services.duplyBackup.profiles.mpd = { - rootDir = "/var/lib/mpd"; - }; secrets.keys = { "mpd" = { 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 @@ snippet = builtins.readFile ./ldap_pub.sh; dependencies = [ pkgs.coreutils ]; }]; - services.duplyBackup.profiles.pub = { - rootDir = "/var/lib/pub"; - remotes = [ "eriomem" "ovh" ]; - }; users.users.pub = let restrict = pkgs.runCommand "restrict" { 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 @@ services.openssh.enable = true; - services.duplyBackup.profiles.system = { - rootDir = "/var/lib"; - excludeFile = lib.mkAfter '' - + /var/lib/nixos - + /var/lib/udev - + /var/lib/udisks2 - + /var/lib/systemd - + /var/lib/private/systemd - - /var/lib - ''; - }; nixpkgs.overlays = builtins.attrValues (import ../../overlays) ++ [ (self: super: { 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 @@ myServices.ejabberd.enable = true; myServices.vpn.enable = true; myServices.ftp.enable = true; - services.duplyBackup.enable = false; - services.duplyBackup.profiles.oldies.rootDir = "/var/lib/oldies"; services.netdata.enable = true; 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 { }; config = lib.mkIf cfg.enable { - services.duplyBackup.profiles.tasks = { - rootDir = "/var/lib"; - excludeFile = '' - + /var/lib/taskserver - + /var/lib/taskwarrior-web - - /var/lib - ''; - }; - secrets.keys = { "webapps/tools-taskwarrior-web" = { 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 { options.myServices.websites.chloe.integration.enable = lib.mkEnableOption "enable Chloe's website in integration"; config = lib.mkIf cfg.enable { - services.duplyBackup.profiles.chloe_integration.rootDir = app.varDir; secrets.keys."websites/chloe/integration" = { user = apacheUser; 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 { options.myServices.websites.chloe.production.enable = lib.mkEnableOption "enable Chloe's website in production"; config = lib.mkIf cfg.enable { - services.duplyBackup.profiles.chloe_production.rootDir = app.varDir; - services.duplyBackup.profiles.chloe_production.remotes = ["eriomem" "ovh"]; secrets.keys."websites/chloe/production" = { user = apacheUser; 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 { options.myServices.websites.connexionswing.integration.enable = lib.mkEnableOption "enable Connexionswing's website in integration"; config = lib.mkIf cfg.enable { - services.duplyBackup.profiles.connexionswing_integration.rootDir = app.varDir; services.phpApplication.apps.connexionswing_integration = { websiteEnv = "integration"; 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 { options.myServices.websites.connexionswing.production.enable = lib.mkEnableOption "enable Connexionswing's website in production"; config = lib.mkIf cfg.enable { - services.duplyBackup.profiles.connexionswing_production.rootDir = app.varDir; - services.duplyBackup.profiles.connexionswing_production.remotes = ["eriomem" "ovh"]; services.webstats.sites = [ { name = "connexionswing.com"; } ]; services.phpApplication.apps.connexionswing_production = { 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 options.myServices.websites.enable = lib.mkEnableOption "enable websites"; config = lib.mkIf config.myServices.websites.enable { - services.duplyBackup.profiles.php = { - rootDir = "/var/lib/php"; - remotes = [ "eriomem" "ovh" ]; - }; users.users.wwwrun.extraGroups = [ "keys" ]; networking.firewall.allowedTCPPorts = [ 80 443 ]; 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 { options.myServices.websites.emilia.moodle.enable = lib.mkEnableOption "enable Emilia's website"; config = lib.mkIf cfg.enable { - services.duplyBackup.profiles.emilia_moodle.rootDir = varDir; system.activationScripts.emilia_moodle = '' install -m 0755 -o ${apacheUser} -g ${apacheGroup} -d ${varDir} ''; 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 { options.myServices.websites.florian.app.enable = lib.mkEnableOption "enable Florian's app in integration"; config = lib.mkIf cfg.enable { - services.duplyBackup.profiles.florian_app.rootDir = app.varDir; services.phpApplication.apps.florian_app = { websiteEnv = "integration"; 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 { options.myServices.websites.immae.temp.enable = lib.mkEnableOption "enable Temp' website"; config = lib.mkIf cfg.enable { - services.duplyBackup.profiles.immae_temp.rootDir = varDir; - services.duplyBackup.profiles.immae_temp_surfer.rootDir = "/var/lib/surfer"; services.websites.env.production.vhostConfs.immae_temp = { certName = "immae"; 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 { options.myServices.websites.isabelle.aten_integration.enable = lib.mkEnableOption "enable Aten's website in integration"; config = lib.mkIf cfg.enable { - services.duplyBackup.profiles.isabelle_aten_integration.rootDir = app.varDir; services.phpApplication.apps.isabelle_aten_integration = { websiteEnv = "integration"; 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 { options.myServices.websites.isabelle.aten_production.enable = lib.mkEnableOption "enable Aten's website in production"; config = lib.mkIf cfg.enable { - services.duplyBackup.profiles.isabelle_aten_production.rootDir = app.varDir; - services.duplyBackup.profiles.isabelle_aten_production.remotes = ["eriomem" "ovh"]; services.webstats.sites = [ { name = "aten.pro"; } ]; services.phpApplication.apps.isabelle_aten_production = { 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 { options.myServices.websites.isabelle.iridologie.enable = lib.mkEnableOption "enable Iridologie's website"; config = lib.mkIf cfg.enable { - services.duplyBackup.profiles.isabelle_iridologie.rootDir = app.varDir; - services.duplyBackup.profiles.isabelle_iridologie.remotes = ["eriomem" "ovh"]; secrets.keys."websites/isabelle/iridologie" = { user = apacheUser; 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 { options.myServices.websites.ludivine.integration.enable = lib.mkEnableOption "enable Ludivine's website in integration"; config = lib.mkIf cfg.enable { - services.duplyBackup.profiles.ludivine_integration.rootDir = app.varDir; services.phpApplication.apps.ludivine_integration = { websiteEnv = "integration"; 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 { options.myServices.websites.ludivine.production.enable = lib.mkEnableOption "enable Ludivine's website in production"; config = lib.mkIf cfg.enable { - services.duplyBackup.profiles.ludivine_production.rootDir = app.varDir; - services.duplyBackup.profiles.ludivine_production.remotes = ["eriomem" "ovh"]; services.webstats.sites = [ { name = "ludivinecassal.com"; } ]; services.phpApplication.apps.ludivine_production = { 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 { options.myServices.websites.piedsjaloux.integration.enable = lib.mkEnableOption "enable PiedsJaloux's website in integration"; config = lib.mkIf cfg.enable { - services.duplyBackup.profiles.piedsjaloux_integration.rootDir = app.varDir; services.phpApplication.apps.piedsjaloux_integration = { websiteEnv = "integration"; 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 { options.myServices.websites.piedsjaloux.production.enable = lib.mkEnableOption "enable PiedsJaloux's website in production"; config = lib.mkIf cfg.enable { - services.duplyBackup.profiles.piedsjaloux_production.rootDir = app.varDir; - services.duplyBackup.profiles.piedsjaloux_production.remotes = ["eriomem" "ovh"]; services.webstats.sites = [ { name = "piedsjaloux.fr"; } ]; services.phpApplication.apps.piedsjaloux_production = { 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 { options.myServices.websites.richie.production.enable = lib.mkEnableOption "enable Richie's website"; config = lib.mkIf cfg.enable { - services.duplyBackup.profiles.richie_production.rootDir = vardir; - services.duplyBackup.profiles.richie_production.remotes = ["eriomem" "ovh"]; services.webstats.sites = [ { name = "europe-richie.org"; } ]; 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 options.myServices.websites.syden.peertube.enable = lib.mkEnableOption "enable Syden's website"; config = lib.mkIf scfg.enable { - services.duplyBackup.profiles.syden_peertube = { - rootDir = dataDir; - remotes = ["eriomem" "ovh"]; - }; users.users.peertube = { uid = config.ids.uids.peertube; 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 { }; config = lib.mkIf cfg.enable { - services.duplyBackup.profiles.diaspora = { - rootDir = dcfg.dataDir; - remotes = [ "eriomem" "ovh" ]; - }; users.users.diaspora.extraGroups = [ "keys" ]; 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 { }; config = lib.mkIf cfg.enable { - services.duplyBackup.profiles.etherpad-lite = { - rootDir = "/var/lib/private/etherpad-lite"; - }; secrets.keys = { "webapps/tools-etherpad-apikey" = { 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 ]; config = lib.mkIf cfg.enable { - services.duplyBackup.profiles.mail.excludeFile = '' - + ${rainloop.varDir} - + ${roundcubemail.varDir} - ''; secrets.keys = roundcubemail.keys; 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 { }; config = lib.mkIf cfg.enable { - services.duplyBackup.profiles.mastodon = { - rootDir = mcfg.dataDir; - }; secrets.keys."webapps/tools-mastodon" = { user = "mastodon"; 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 { }; config = lib.mkIf cfg.enable { - services.duplyBackup.profiles.mgoblin = { - rootDir = mcfg.dataDir; - }; secrets.keys."webapps/tools-mediagoblin" = { user = "mediagoblin"; 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 { }; config = lib.mkIf cfg.enable { - services.duplyBackup.profiles.peertube = { - rootDir = pcfg.dataDir; - }; services.peertube = { enable = true; 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 { // csp-reports.keys // webhooks.keys; - services.duplyBackup.profiles = { - dokuwiki = dokuwiki.backups; - grocy = grocy.backups; - kanboard = kanboard.backups; - rompr = rompr.backups; - shaarli = shaarli.backups; - ttrss = ttrss.backups; - wallabag = wallabag.backups; - phpbb = phpbb.backups; - }; - services.websites.env.tools.modules = [ "proxy_fcgi" ] ++ 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 @@ { lib, stdenv, dokuwiki, dokuwiki-plugins }: rec { - backups = { - rootDir = varDir; - remotes = [ "eriomem" "ovh" ]; - }; varDir = "/var/lib/dokuwiki"; activationScript = { 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 @@ { lib, stdenv, grocy }: rec { - backups = { - rootDir = varDir; - }; varDir = "/var/lib/grocy"; activationScript = { 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 @@ { env, kanboard, config }: rec { - backups = { - rootDir = varDir; - }; varDir = "/var/lib/kanboard"; activationScript = { 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 @@ { lib, phpbb, gnused }: rec { - backups = { - rootDir = varDir; - }; varDir = "/var/lib/phpbb"; activationScript = { 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 @@ { lib, env, rompr }: rec { - backups = { - rootDir = varDir; - }; varDir = "/var/lib/rompr"; activationScript = '' 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 @@ let varDir = "/var/lib/shaarli"; in rec { - backups = { - rootDir = varDir; - remotes = [ "eriomem" "ovh" ]; - }; activationScript = '' install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} \ ${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 @@ { php, env, ttrss, ttrss-plugins, config }: rec { - backups = { - rootDir = varDir; - }; varDir = "/var/lib/ttrss"; activationScript = { 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 @@ { env, wallabag, mylibs, config }: rec { - backups = { - rootDir = varDir; - remotes = [ "eriomem" "ovh" ]; - }; varDir = "/var/lib/wallabag"; keys."webapps/tools-wallabag" = { 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 { }; config = lib.mkIf (builtins.length cfg.sites > 0) { - services.duplyBackup.profiles.goaccess = { - rootDir = cfg.dataDir; - }; users.users.root.packages = [ pkgs.goaccess ]; -- 2.41.0