Make backup one-size-fits-all

3 files changed, 17 insertions, 10 deletions

diff --git a/.linux/systemd/laptop-backup.timer b/.linux/systemd/laptop-backup.timer
deleted file mode 100644
index 008e7f3..0000000
--- a/.linux/systemd/laptop-backup.timer
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Run laptop backup with restic daily
-
-[Timer]
-OnCalendar=*-*-* 00:00:00
-
-[Install]
-WantedBy=default.target
diff --git a/.linux/systemd/laptop-backup.service b/.linux/systemd/system-backup.service
index 8fb5119..b4569ab 100644
--- a/.linux/systemd/laptop-backup.service
+++ b/.linux/systemd/system-backup.service
@@ -1,11 +1,16 @@
 [Unit]
-Description=backup laptop with restic
+Description=backup system with restic
+
+ConditionPathExists=%h/.restic-key
+ConditionPathExists=%h/.backup-filter
 
 [Service]
 Type=oneshot
+
+ExecCondition=ping -q -c1 -W1 -w1 schroeder.sea1.crute.me
+
 Environment="RESTIC_REPOSITORY=rest:http://schroeder.sea1.crute.me:6275/mcrute-devices"
 Environment="RESTIC_PASSWORD_FILE=%h/.restic-key"
-ExecCondition=ping -q -c1 -W1 -w1 schroeder.sea1.crute.me
 ExecStart=restic backup --exclude-file %h/.backup-filter %h
 
 [Install]
diff --git a/.linux/systemd/system-backup.timer b/.linux/systemd/system-backup.timer
new file mode 100644
index 0000000..8edddb7
--- /dev/null
+++ b/.linux/systemd/system-backup.timer
@@ -0,0 +1,10 @@
+[Unit]
+Description=Run system backup with restic daily
+
+[Timer]
+OnCalendar=*-*-* 00:00:00
+AccuracySec=8h
+RandomizedDelaySec=15m
+
+[Install]
+WantedBy=default.target