diff --git a/modules/backup-job.nix b/modules/backup-job.nix index 34da967..a7c216f 100644 --- a/modules/backup-job.nix +++ b/modules/backup-job.nix @@ -24,7 +24,11 @@ in postHook = mkOption { type = types.lines; - default = ""; + default = '' + if [ $exitStatus -ne 0 ]; then + touch /nix/var/data/backup/backup-ok + fi + ''; }; startAt = mkOption { @@ -49,7 +53,7 @@ in services.borgbackup.jobs.data = { paths = [ "/nix/var/data" cfg.sshKey ] ++ cfg.additionalPaths; doInit = false; - repo = "backup@212.129.12.205:./"; + repo = "borgbackup@212.129.12.205:./"; encryption = { mode = "repokey-blake2"; passCommand = "cat ${config.sops.secrets.borgPassphrase.path}"; diff --git a/profiles/backend.nix b/profiles/backend.nix index 43d6c1e..84e99c5 100644 --- a/profiles/backend.nix +++ b/profiles/backend.nix @@ -32,9 +32,6 @@ preHook = '' cp /var/lib/murmur/murmur.sqlite /nix/var/data/murmur/murmur.sqlite ''; - postHook = '' - touch /nix/var/data/backup/backup-ok - ''; startAt = "03:30"; sshKey = config.sops.secrets.borgSshKey.path; }; diff --git a/profiles/db.nix b/profiles/db.nix index eda2eff..d43ef3b 100644 --- a/profiles/db.nix +++ b/profiles/db.nix @@ -26,7 +26,6 @@ ${pkgs.postgresql_12}/bin/pg_dump -U nextcloud nextcloud > /nix/var/data/postgresql/nextcloud.dmp ${pkgs.postgresql_12}/bin/pg_dump -U roundcube roundcube > /nix/var/data/postgresql/roundcube.dmp ''; - postHook = "touch /nix/var/data/backup/backup-ok"; startAt = "03:00"; sshKey = config.sops.secrets.borgSshKey.path; }; diff --git a/profiles/storage.nix b/profiles/storage.nix index 14f14b9..090cea8 100644 --- a/profiles/storage.nix +++ b/profiles/storage.nix @@ -38,7 +38,6 @@ enable = true; readWritePaths = [ "/nix/var/data/backup" ]; preHook = "${pkgs.docker}/bin/docker exec stb-mariadb sh -c 'mysqldump -u stb -pstb stb' > /nix/var/data/backup/stb_mariadb.sql"; - postHook = "touch /nix/var/data/backup/backup-ok"; startAt = "04:00"; sshKey = config.sops.secrets.borgSshKey.path; };