moved prune to backup

restic/.bin/restic_backup

@@ -2,6 +2,13 @@
 
 source $HOME/.bin/restic_common
 
-info "Starting backup"
 restic -r $RESTIC_REPOSITORY unlock
+
+info "Starting backup"
 restic --cache-dir $CACHE_DIR -r $RESTIC_REPOSITORY backup $BACKUP_PATHS $BACKUP_EXCLUDES
+
+info "Forgetting snapshots"
+restic --cache-dir $CACHE_DIR -r $RESTIC_REPOSITORY forget --keep-hourly $KEEP_HOURS --keep-daily $KEEP_DAYS --keep-weekly $KEEP_WEEKS --keep-monthly $KEEP_WEEKS --keep-yearly $KEEP_YEARS
+
+info "Pruning snapshots"
+restic --cache-dir $CACHE_DIR -r $RESTIC_REPOSITORY prune

restic/.bin/restic_common

@@ -38,7 +38,7 @@ ping -c 3 192.168.178.100 &> /dev/null
 
 if [[ $? > 0 ]]; then
 
-  ping -c 3 1.1.1.1 &> /dev/null
+  ping -c 3 10.0.1.3 &> /dev/null
 
   if [[ $? > 0 ]]; then
     info "Not connected."

restic/.bin/restic_prune

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-source $HOME/.bin/restic_common
-
-info "Forgetting snapshots"
-restic -r $RESTIC_REPOSITORY unlock
-restic --cache-dir $CACHE_DIR -r $RESTIC_REPOSITORY forget --keep-hourly $KEEP_HOURS --keep-daily $KEEP_DAYS --keep-weekly $KEEP_WEEKS --keep-monthly $KEEP_WEEKS --keep-yearly $KEEP_YEARS
-
-info "Pruning snapshots"
-restic -r $RESTIC_REPOSITORY unlock
-restic --cache-dir $CACHE_DIR -r $RESTIC_REPOSITORY prune

restic/.config/systemd/user/restic-backup.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=borg backup
+Description=restic backup
 Before=restic-prune.service
 
 [Service]

restic/.config/systemd/user/restic-prune.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=prune borg snapshots
-After=restic-backup.service
-
-[Service]
-Type=oneshot
-ExecStart=%h/.bin/restic_prune
-
-[Install]
-WantedBy=multi-user.target

restic/.config/systemd/user/restic-prune.timer

@@ -1,10 +0,0 @@
-[Unit]
-Description=prune restic snapshots
-
-[Timer]
-Persistent=true
-OnCalendar=daily
-Unit=restic-prune.service
-
-[Install]
-WantedBy=timers.target