diff --git a/hosts/genepi/backup.nix b/hosts/genepi/backup.nix index fa7e786..4fc6435 100644 --- a/hosts/genepi/backup.nix +++ b/hosts/genepi/backup.nix @@ -17,7 +17,7 @@ in age.secrets.restic-genepi-storagebox-password.file = ../../secrets/restic-genepi-storagebox-password.age; programs.ssh.knownHosts = { - "${storagebox-host}".publicKey = keys.hosts.storagebox; + "${storagebox-host}".publicKey = keys.hosts.storagebox-rsa; }; services.restic.backups = { @@ -27,7 +27,7 @@ in "/persist" ]; passwordFile = config.age.secrets.restic-genepi-storagebox-key.path; - repository = "sftp://${storagebox-user}@${storagebox-host}"; + repository = "sftp://${storagebox-user}@${storagebox-host}/"; extraOptions = [ "sftp.command='${pkgs.sshpass}/bin/sshpass -f ${config.age.secrets.restic-genepi-storagebox-password.path} -- ssh ${storagebox-host} -l ${storagebox-user} -s sftp'" ]; @@ -35,6 +35,12 @@ in OnCalendar = "03:00"; RandomizedDelaySec = "1h"; }; + pruneOpts = [ + "--keep-daily 7" + "--keep-weekly 5" + "--keep-monthly 12" + "--keep-yearly 10" + ]; }; }; } diff --git a/parts/keys.nix b/parts/keys.nix index 16c77c7..c44491a 100644 --- a/parts/keys.nix +++ b/parts/keys.nix @@ -4,5 +4,6 @@ hosts = { genepi = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICQUzjid5mfMYginIUCVWTF7rWvWz0mUZBZsl5EhDIDl root@genepi"; storagebox = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIICf9svRenC/PLKIL9nk6K/pxQgoiFC41wTNvoIncOxs"; + storagebox-rsa = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA5EB5p/5Hp3hGW1oHok+PIOH9Pbn7cnUiGmUEBrCVjnAw+HrKyN8bYVV0dIGllswYXwkG/+bgiBlE6IVIBAq+JwVWu1Sss3KarHY3OvFJUXZoZyRRg/Gc/+LRCE7lyKpwWQ70dbelGRyyJFH36eNv6ySXoUYtGkwlU5IVaHPApOxe4LHPZa/qhSRbPo2hwoh0orCtgejRebNtW5nlx00DNFgsvn8Svz2cIYLxsPVzKgUxs8Zxsxgn+Q/UvR7uq4AbAhyBMLxv7DjJ1pc7PJocuTno2Rw9uMZi1gkjbnmiOh6TTXIEWbnroyIhwc8555uto9melEUmWNQ+C+PwAK+MPw=="; }; }