Browse Source

Fix ordering for conflicts

cryobry 4 years ago
parent
commit
f5ec4ff46e
5 changed files with 9 additions and 5 deletions
  1. 1 0
      rsnapshot-daily.timer
  2. 1 0
      rsnapshot-hourly.timer
  3. 1 0
      rsnapshot-weekly.timer
  4. 5 5
      rsnapshot.conf
  5. 1 0
      rsnapshot@.service

+ 1 - 0
rsnapshot-daily.timer

@@ -1,6 +1,7 @@
 [Unit]
 Description=rsnapshot daily backup
 PartOf=rsnapshot-schedule.target
+Before=rsnapshot-weekly.timer rsnapshot-monthly.timer
 
 [Timer]
 # 05:30 is the clock time when to start it

+ 1 - 0
rsnapshot-hourly.timer

@@ -1,6 +1,7 @@
 [Unit]
 Description=rsnapshot hourly backup
 PartOf=rsnapshot-schedule.target
+Before=rsnapshot-daily.timer rsnapshot-weekly.timer rsnapshot-monthly.timer
 
 [Timer]
 # Run hourly

+ 1 - 0
rsnapshot-weekly.timer

@@ -1,6 +1,7 @@
 [Unit]
 Description=rsnapshot weekly backup
 PartOf=rsnapshot-schedule.target
+Before=rsnapshot-monthly.timer
 
 [Timer]
 # Run once per week on Monday at 4:30, after daily runs

+ 5 - 5
rsnapshot.conf

@@ -158,8 +158,8 @@ rsync_long_args		--delete
 # The include and exclude parameters, if enabled, simply get passed directly
 # to rsync. If you have multiple include/exclude patterns, put each one on a
 # separate line. Please look up the --include and --exclude options in the
-# rsync man page for more details on how to specify file name patterns. 
-# 
+# rsync man page for more details on how to specify file name patterns.
+#
 #include	???
 #include	???
 #exclude	???
@@ -225,10 +225,10 @@ exclude_file	/home/bryan/.config/systemd/user/rsnapshot-home-excludes.txt
 ###############################
 
 # LOCALHOST
-backup	/home/bryan/		localhost/
-#backup	/etc/		localhost/
+backup	/home/bryan/	localhost/
+#backup	/etc/	localhost/
 #backup	/usr/local/	localhost/
-#backup	/var/log/rsnapshot		localhost/
+#backup	/var/log/rsnapshot	localhost/
 #backup	/etc/passwd	localhost/
 #backup	/home/foo/My Documents/		localhost/
 #backup	/foo/bar/	localhost/	one_fs=1, rsync_short_args=-urltvpog

+ 1 - 0
rsnapshot@.service

@@ -9,5 +9,6 @@ Type=oneshot
 Nice=19
 IOSchedulingClass=idle
 PIDFile=%h/.config/systemd/user/rsnapshot.pid
+Restart=on-failure
 ExecStart=/usr/bin/rsnapshot -c %h/.config/systemd/user/rsnapshot.conf %I