update systemd timers etc

10 files changed, 9 insertions, 26 deletions

diff --git a/dot_config/systemd/user/backup-email.timer b/dot_config/systemd/user/backup-email.timer
deleted file mode 100644
index bf49a60..0000000
--- a/dot_config/systemd/user/backup-email.timer
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Backup email
-
-[Timer]
-OnCalendar=daily
-Persistent=true
-RandomizedDelaySec=3h
-
-[Install]
-WantedBy=timers.target
diff --git a/dot_config/systemd/user/backup-email.service b/dot_config/systemd/user/backup-email@.service
index 47260f1..4f9e176 100644
--- a/dot_config/systemd/user/backup-email.service
+++ b/dot_config/systemd/user/backup-email@.service
@@ -3,11 +3,7 @@ Description=backup dovecot
 Wants=network-online.target
 BindsTo=dovecot.service
 After=network-online.target
-ConditionFileNotEmpty=/media/t/Archives/email/rak.ac/backup.sh
-Before=borgmatic@tosh.service
-
-[Install]
-WantedBy=borgmatic@tosh.service
+ConditionFileNotEmpty=/media/t/Archives/email/%I/backup.sh
 
 [Service]
 Type=oneshot
@@ -35,4 +31,4 @@ IOWeight=100
 Restart=no
 LogRateLimitIntervalSec=0
 
-ExecStart=/media/t/Archives/email/rak.ac/backup.sh
+ExecStart=/media/t/Archives/email/%I/backup.sh
diff --git a/dot_config/systemd/user/backup-irclogs.timer b/dot_config/systemd/user/backup-irclogs.timer
deleted file mode 100644
index c074ecb..0000000
--- a/dot_config/systemd/user/backup-irclogs.timer
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Backup irc logs
-
-[Timer]
-OnCalendar=weekly
-Persistent=true
-RandomizedDelaySec=1h
-
-[Install]
-WantedBy=timers.target
diff --git a/dot_config/systemd/user/borgmatic@tosh.service.wants/symlink_backup-email@mail.cs.mcgill.ca.service b/dot_config/systemd/user/borgmatic@tosh.service.wants/symlink_backup-email@mail.cs.mcgill.ca.service
new file mode 100644
index 0000000..ef74119
--- /dev/null
+++ b/dot_config/systemd/user/borgmatic@tosh.service.wants/symlink_backup-email@mail.cs.mcgill.ca.service
@@ -0,0 +1 @@
+../backup-email@.service
diff --git a/dot_config/systemd/user/borgmatic@tosh.service.wants/symlink_backup-email@rak.ac.service b/dot_config/systemd/user/borgmatic@tosh.service.wants/symlink_backup-email@rak.ac.service
new file mode 100644
index 0000000..ef74119
--- /dev/null
+++ b/dot_config/systemd/user/borgmatic@tosh.service.wants/symlink_backup-email@rak.ac.service
@@ -0,0 +1 @@
+../backup-email@.service
diff --git a/dot_config/systemd/user/borgmatic@tosh.service.wants/symlink_backup-irclogs.service b/dot_config/systemd/user/borgmatic@tosh.service.wants/symlink_backup-irclogs.service
new file mode 100644
index 0000000..bc2552a
--- /dev/null
+++ b/dot_config/systemd/user/borgmatic@tosh.service.wants/symlink_backup-irclogs.service
@@ -0,0 +1 @@
+../backup-irclogs.service
diff --git a/dot_config/systemd/user/timers.target.wants/symlink_borgmatic@home.timer b/dot_config/systemd/user/timers.target.wants/symlink_borgmatic@home.timer
new file mode 100644
index 0000000..e2ce4d2
--- /dev/null
+++ b/dot_config/systemd/user/timers.target.wants/symlink_borgmatic@home.timer
@@ -0,0 +1 @@
+../borgmatic@.timer
diff --git a/dot_config/systemd/user/timers.target.wants/symlink_borgmatic@music.timer b/dot_config/systemd/user/timers.target.wants/symlink_borgmatic@music.timer
new file mode 100644
index 0000000..e2ce4d2
--- /dev/null
+++ b/dot_config/systemd/user/timers.target.wants/symlink_borgmatic@music.timer
@@ -0,0 +1 @@
+../borgmatic@.timer
diff --git a/dot_config/systemd/user/timers.target.wants/symlink_borgmatic@pictures.timer b/dot_config/systemd/user/timers.target.wants/symlink_borgmatic@pictures.timer
new file mode 100644
index 0000000..e2ce4d2
--- /dev/null
+++ b/dot_config/systemd/user/timers.target.wants/symlink_borgmatic@pictures.timer
@@ -0,0 +1 @@
+../borgmatic@.timer
diff --git a/dot_config/systemd/user/timers.target.wants/symlink_borgmatic@tosh.timer b/dot_config/systemd/user/timers.target.wants/symlink_borgmatic@tosh.timer
new file mode 100644
index 0000000..e2ce4d2
--- /dev/null
+++ b/dot_config/systemd/user/timers.target.wants/symlink_borgmatic@tosh.timer
@@ -0,0 +1 @@
+../borgmatic@.timer