From 49327308575f16f59da819168851e56609447296 Mon Sep 17 00:00:00 2001 From: = <=> Date: Sat, 8 Nov 2025 21:24:08 +0000 Subject: [PATCH] fix mismatched types issue --- helpers/services.nix | 81 ++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/helpers/services.nix b/helpers/services.nix index 299df96..77c9cd3 100644 --- a/helpers/services.nix +++ b/helpers/services.nix @@ -124,49 +124,48 @@ in { extraConfig = extraCfg; }; }) {} (builtins.attrNames cfg); + }; - services.borgbackup.jobs = - builtins.foldl' - (acc: key: let - site = cfg.${key}; - dump = site.backup.database; - paths = builtins.concatLists [ - site.backup.paths - (if dump != null then [ "/var/backup/${key}.sql" ] else []) - ]; - preHook = lib.mkIf (dump != null) '' - mkdir -p /var/backup - ${pkgs.sudo}/bin/sudo -u postgres pg_dump ${dump} > /var/backup/postgres/${key}.sql - ''; - postHook = lib.mkIf (dump != null) '' - rm -f /var/backup/postgres/${key}.sql - ''; - in - acc - // lib.mkIf site.backup.enable { - "${key}" = { - repo = backup_cfg.borgRepository + "/./${key}"; - environment = { - BORG_RSH = "ssh -i ${backup_cfg.borgSSHKey} -o 'StrictHostKeyChecking=no'"; - }; - inherit paths; - encryption = { - mode = "keyfile"; - passCommand = backup_cfg.borgPassCommand; - }; - compression = "auto,lzma"; - startAt = "daily"; - prune.keep = { - daily = 7; - weekly = 4; - monthly = -1; - }; - inherit preHook; - inherit postHook; + services.borgbackup.jobs = + builtins.foldl' + (acc: key: let + site = cfg.${key}; + dump = site.backup.database; + paths = builtins.concatLists [ + site.backup.paths + (if dump != null then [ "/var/backup/${key}.sql" ] else []) + ]; + preHook = lib.mkIf (dump != null) '' + mkdir -p /var/backup + ${pkgs.sudo}/bin/sudo -u postgres pg_dump ${dump} > /var/backup/postgres/${key}.sql + ''; + postHook = lib.mkIf (dump != null) '' + rm -f /var/backup/postgres/${key}.sql + ''; + in + acc + // lib.mkIf site.backup.enable { + "${key}" = { + repo = backup_cfg.borgRepository + "/./${key}"; + environment = { + BORG_RSH = "ssh -i ${backup_cfg.borgSSHKey} -o 'StrictHostKeyChecking=no'"; }; - }) - {} - (builtins.attrNames cfg); + inherit paths; + encryption = { + mode = "keyfile"; + passCommand = backup_cfg.borgPassCommand; + }; + compression = "auto,lzma"; + startAt = "daily"; + prune.keep = { + daily = 7; + weekly = 4; + monthly = -1; + }; + inherit preHook; + inherit postHook; + }; + }) {} (builtins.attrNames cfg); systemd.tmpfiles.settings = { "99-borgdatabasebackups"."/var/backup/postgres".d = {