Merge branch 'master' of github.com:Kropatz/dotfiles

This commit is contained in:
Kopatz
2024-01-16 09:15:06 +01:00
2 changed files with 4 additions and 8 deletions

View File

@@ -51,7 +51,6 @@
./modules/hdd-spindown.nix ./modules/hdd-spindown.nix
./modules/firewall.nix ./modules/firewall.nix
./modules/wireshark.nix ./modules/wireshark.nix
./modules/minecraft-server.nix
./modules/motd.nix ./modules/motd.nix
./modules/postgres.nix ./modules/postgres.nix
./modules/fail2ban.nix ./modules/fail2ban.nix
@@ -59,7 +58,6 @@
./modules/adguard.nix ./modules/adguard.nix
./modules/git.nix ./modules/git.nix
./modules/github-runner.nix ./modules/github-runner.nix
./modules/synapse.nix
./modules/nextcloud.nix ./modules/nextcloud.nix
./modules/acme.nix ./modules/acme.nix
./modules/samba.nix ./modules/samba.nix
@@ -70,10 +68,8 @@
./modules/docker.nix ./modules/docker.nix
./modules/wireguard.nix ./modules/wireguard.nix
./modules/cron.nix ./modules/cron.nix
./modules/paperless.nix
./modules/kavita.nix ./modules/kavita.nix
./modules/netdata.nix ./modules/netdata.nix
./modules/invidious.nix
./modules/step-ca.nix ./modules/step-ca.nix
./modules/tmpfs.nix ./modules/tmpfs.nix
./modules/logging.nix ./modules/logging.nix

View File

@@ -29,7 +29,7 @@
"/mnt/250ssd/paperless" "/mnt/250ssd/paperless"
"/mnt/250ssd/kavita" "/mnt/250ssd/kavita"
]; ];
pruneOpts = [ "--keep-daily 7" "--keep-weekly 10" "--keep-monthly 12" "--keep-yearly 75" ]; pruneOpts = [ "--keep-daily 7" "--keep-weekly 3" "--keep-monthly 3" "--keep-yearly 3" ];
repository = "/mnt/2tb/restic"; repository = "/mnt/2tb/restic";
}; };
localbackup-1tb = { localbackup-1tb = {
@@ -51,7 +51,7 @@
"/home/**/venv" "/home/**/venv"
]; ];
repository = "/mnt/1tb/restic"; repository = "/mnt/1tb/restic";
pruneOpts = [ "--keep-daily 5" "--keep-weekly 5" "--keep-monthly 12" "--keep-yearly 75" ]; pruneOpts = [ "--keep-daily 5" "--keep-weekly 3" "--keep-monthly 3" "--keep-yearly 3" ];
timerConfig = { timerConfig = {
OnCalendar = "*-*-03,06,09,12,15,18,21,24,27,30 02:00:00"; OnCalendar = "*-*-03,06,09,12,15,18,21,24,27,30 02:00:00";
Persistent = true; Persistent = true;
@@ -78,7 +78,7 @@
]; ];
rcloneConfigFile = config.age.secrets.restic-gdrive.path; rcloneConfigFile = config.age.secrets.restic-gdrive.path;
repository = "rclone:it-experts:backup"; repository = "rclone:it-experts:backup";
pruneOpts = [ "--keep-daily 5" "--keep-weekly 5" "--keep-monthly 12" "--keep-yearly 75" ]; pruneOpts = [ "--keep-daily 5" "--keep-weekly 3" "--keep-monthly 3" "--keep-yearly 3" ];
timerConfig = { timerConfig = {
OnCalendar = "*-*-03,06,09,12,15,18,21,24,27,30 02:00:00"; OnCalendar = "*-*-03,06,09,12,15,18,21,24,27,30 02:00:00";
Persistent = true; Persistent = true;
@@ -100,7 +100,7 @@
"/home" "/home"
"/var/backup/postgresql" "/var/backup/postgresql"
]; ];
pruneOpts = [ "--keep-daily 5" "--keep-weekly 5" "--keep-monthly 12" "--keep-yearly 75" ]; pruneOpts = [ "--keep-daily 5" "--keep-weekly 3" "--keep-monthly 3" "--keep-yearly 3" ];
timerConfig = { timerConfig = {
OnCalendar = "*-*-03,06,09,12,15,18,21,24,27,30 00:00:00"; OnCalendar = "*-*-03,06,09,12,15,18,21,24,27,30 00:00:00";
Persistent = true; Persistent = true;