diff --git a/borg_backup.sh b/borg_backup.sh deleted file mode 100755 index dbc87fd..0000000 --- a/borg_backup.sh +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/bash - -### -### borg_backup.sh -### -### Usage: -### borg_backup.sh [-f] -### -### Options: -### -f Force an update, even if one was already made today. -### -h Print this help message and quit. -### - - -print_help() { - awk -F'### ' '/^###/ { print $2 }' "$0" -} - -cache_file="$HOME/.cache/borg_backup_hook_last_executed" -stat_cache_file() { - # We only want this file to be executed at most once per day, so we stat a cache - # file before running the rest of the code - if [ -f "$cache_file" ]; then - cache_stat=$(stat -c %y "$cache_file" | cut -d' ' -f1) - today=$(date +%Y-%m-%d) - if [ "$cache_stat" = "$today" ]; then - echo "The borg backup was already executed today" && exit 0 - fi - fi -} - -if [ "$1" = '-h' ]; then - print_help && exit 1 -fi - -if [ ! "$UID" -eq 0 ]; then - echo "You have to run this as root!" && exit 1 -fi - -[ "$1" = '-f' ] || stat_cache_file - -touch "$cache_file" - -# Setting this so the repo does not need to be given on the command line: -BORG_REPO=ssh://"$BORG_REPO":22/~/"$(hostname)".borg -export BORG_REPO - -BORG_PASSPHRASE="$BORG_PASSPHRASE" -export BORG_PASSPHRASE - -# some helpers and error handling: -info() { printf "\n%s %s\n\n" "$(date)" "$*" >&2; } -trap 'echo $(date) Backup interrupted >&2; exit 2' INT TERM - -info "Starting backup" - -# Backup the most important directories into an archive named after -# the machine this script is currently running on: -borg create \ - --verbose \ - --filter AME \ - --list \ - --stats \ - --show-rc \ - --compression lz4 \ - --exclude-caches \ - --exclude '/home/*/.*/*' \ - --exclude '/home/*/.*' \ - --exclude-from <(echo "$BORG_EXCLUDES")\ - --exclude '/var/cache/*' \ - --exclude '/var/log/*' \ - --exclude '/var/tmp/*' \ - \ - ::'{hostname}-{now}' \ - /etc \ - /home \ - /root \ - /var \ - -backup_exit=$? - -info "Pruning repository" - -# Use the `prune` subcommand to maintain 7 daily, 4 weekly and 6 monthly -# archives of THIS machine. The '{hostname}-' prefix is very important to -# limit prune's operation to this machine's archives and not apply to -# other machines' archives also: -borg prune \ - --list \ - --prefix '{hostname}-' \ - --show-rc \ - --keep-daily 7 \ - --keep-weekly 4 \ - --keep-monthly 6 \ - -prune_exit=$? - -# Use highest exit code as global exit code -global_exit=$(( backup_exit > prune_exit ? backup_exit : prune_exit )) - -if [ ${global_exit} -eq 0 ]; then - info "Backup and Prune finished succesfully" -elif [ ${global_exit} -eq 1 ]; then - info "Backup and/or Prune finished with warnings" -else - info "Backup and/or Prune finished with errors" -fi - -exit ${global_exit} diff --git a/configs.yml b/configs.yml index ec95df4..65a9772 100644 --- a/configs.yml +++ b/configs.yml @@ -18,19 +18,6 @@ mariadb: command: sudo mariadb-install-db --user=mysql --basedir=/usr --datadir=/var/lib/mysql && sudo systemctl start mysqld.service && sudo mysql_secure_installation condition: "sudo find /var/lib/mysql -mindepth 1 | read" -pacman_hooks: - - run: - command: sudo ln -rsi dotfiles/pacman_hooks/borg_backup.hook /etc/pacman.d/hooks/borg_backup.hook - condition: "[[ $(uname -n) = 'arch-desktop' ]]" - - run: - - sudo ln -rsi dotfiles/pacman_hooks/new_orphan.hook /etc/pacman.d/hooks/new_orphan.hook - - run: - - sudo ln -rsi dotfiles/pacman_hooks/pacdiff.hook /etc/pacman.d/hooks/pacdiff.hook - - run: - - sudo ln -rsi dotfiles/pacman_hooks/mirrorupgrade.hook /etc/pacman.d/hooks/mirrorupgrade.hook - - run: - - sudo ln -rsi dotfiles/pacman_hooks/paccache.hook /etc/pacman.d/hooks/paccache.hook - rsync_backup: - run: - sudo ln -rsi dotfiles/systemd/rsync_backup.timer /etc/systemd/system/rsync_backup.timer diff --git a/dotfiles/pacman_hooks/borg_backup.hook b/dotfiles/pacman_hooks/borg_backup.hook deleted file mode 100644 index 545bc66..0000000 --- a/dotfiles/pacman_hooks/borg_backup.hook +++ /dev/null @@ -1,12 +0,0 @@ -[Trigger] -Operation = Install -Operation = Upgrade -Operation = Remove -Type = Package -Target = * - -[Action] -Description = Borg backup -When = PreTransaction -Exec = /bin/bash -c 'source /home/*/setup-cockpit/secrets && /home/*/setup-cockpit/borg_backup.sh' -Depends = borg diff --git a/dotfiles/pacman_hooks/mirrorupgrade.hook b/roles/pacman/files/mirrorupgrade.hook similarity index 100% rename from dotfiles/pacman_hooks/mirrorupgrade.hook rename to roles/pacman/files/mirrorupgrade.hook diff --git a/dotfiles/pacman_hooks/new_orphan.hook b/roles/pacman/files/new_orphan.hook similarity index 100% rename from dotfiles/pacman_hooks/new_orphan.hook rename to roles/pacman/files/new_orphan.hook diff --git a/dotfiles/pacman_hooks/paccache.hook b/roles/pacman/files/paccache.hook similarity index 100% rename from dotfiles/pacman_hooks/paccache.hook rename to roles/pacman/files/paccache.hook diff --git a/dotfiles/pacman_hooks/pacdiff.hook b/roles/pacman/files/pacdiff.hook similarity index 100% rename from dotfiles/pacman_hooks/pacdiff.hook rename to roles/pacman/files/pacdiff.hook diff --git a/roles/pacman/tasks/main.yml b/roles/pacman/tasks/main.yml index b064e62..cea0a81 100644 --- a/roles/pacman/tasks/main.yml +++ b/roles/pacman/tasks/main.yml @@ -36,9 +36,18 @@ replace: VerbosePkgLists backup: true -- name: Make sure hooks directory exists +- name: Make sure HookDir exists become: true file: path: /etc/pacman.d/hooks state: directory mode: 0755 + +- name: Copy hooks + become: true + copy: src={{ item.src }} dest={{ item.dest }} backup=true + with_items: + - { src: 'new_orphan.hook', dest: '/etc/pacman.d/hooks/new_orphan.hook' } + - { src: 'pacdiff.hook', dest: '/etc/pacman.d/hooks/pacdiff.hook' } + - { src: 'mirrorupgrade.hook', dest: '/etc/pacman.d/hooks/mirrorupgrade.hook' } + - { src: 'paccache.hook', dest: '/etc/pacman.d/hooks/paccache.hook' }