From 41910f65cd986a82ded79443dc4483524f331fb4 Mon Sep 17 00:00:00 2001 From: Pig Monkey Date: Tue, 14 Jul 2026 16:25:44 -0700 Subject: [PATCH] drop cryptshot --- .gitmodules | 3 - playbook.yml | 1 - roles/cryptshot/files/cryptshot | 1 - roles/cryptshot/handlers/main.yml | 5 - roles/cryptshot/meta/main.yml | 4 - roles/cryptshot/tasks/config.yml | 12 - roles/cryptshot/tasks/main.yml | 64 ----- roles/cryptshot/templates/cryptshot.conf.j2 | 3 - .../cryptshot/templates/cryptshot.service.j2 | 7 - roles/cryptshot/templates/cryptshot.sh.j2 | 8 - roles/cryptshot/templates/cryptshot.timer.j2 | 10 - roles/cryptshot/templates/rsnapshot.conf.j2 | 234 ------------------ 12 files changed, 352 deletions(-) delete mode 160000 roles/cryptshot/files/cryptshot delete mode 100644 roles/cryptshot/handlers/main.yml delete mode 100644 roles/cryptshot/meta/main.yml delete mode 100644 roles/cryptshot/tasks/config.yml delete mode 100644 roles/cryptshot/tasks/main.yml delete mode 100644 roles/cryptshot/templates/cryptshot.conf.j2 delete mode 100644 roles/cryptshot/templates/cryptshot.service.j2 delete mode 100644 roles/cryptshot/templates/cryptshot.sh.j2 delete mode 100644 roles/cryptshot/templates/cryptshot.timer.j2 delete mode 100644 roles/cryptshot/templates/rsnapshot.conf.j2 diff --git a/.gitmodules b/.gitmodules index 62bedbd..8effd56 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "roles/backitup/files/backitup"] path = roles/backitup/files/backitup url = https://github.com/pigmonkey/backitup -[submodule "roles/cryptshot/files/cryptshot"] - path = roles/cryptshot/files/cryptshot - url = https://github.com/pigmonkey/cryptshot [submodule "roles/resnap/files/resnap"] path = roles/resnap/files/resnap url = https://github.com/pigmonkey/resnap diff --git a/playbook.yml b/playbook.yml index 88fe776..8ca78b7 100644 --- a/playbook.yml +++ b/playbook.yml @@ -62,7 +62,6 @@ - { role: libvirt, tags: ["libvirt"] } - { role: virtualbox, tags: ["virtualbox"] } - { role: backitup, tags: ["backitup"] } - - { role: cryptshot, tags: ["cryptshot"], when: "cryptshot is defined" } - { role: resnap, tags: ["resnap"], when: "resnap is defined" } - { role: restash, tags: ["restash"], when: "restash is defined" } - { role: mapping, tags: ["mapping"] } diff --git a/roles/cryptshot/files/cryptshot b/roles/cryptshot/files/cryptshot deleted file mode 160000 index c410f4b..0000000 --- a/roles/cryptshot/files/cryptshot +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c410f4b33a25afed0f7519de442f0faaa52b8e1a diff --git a/roles/cryptshot/handlers/main.yml b/roles/cryptshot/handlers/main.yml deleted file mode 100644 index 279b4d0..0000000 --- a/roles/cryptshot/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: Restart cryptshot - ansible.builtin.service: - name: cryptshot.timer - state: restarted diff --git a/roles/cryptshot/meta/main.yml b/roles/cryptshot/meta/main.yml deleted file mode 100644 index bf6e3c0..0000000 --- a/roles/cryptshot/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -dependencies: - - { role: systemd } - - { role: backitup } diff --git a/roles/cryptshot/tasks/config.yml b/roles/cryptshot/tasks/config.yml deleted file mode 100644 index d7cc0a8..0000000 --- a/roles/cryptshot/tasks/config.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- name: "Push rsnapshot config: {{ target.name }}" - ansible.builtin.template: - src: rsnapshot.conf.j2 - dest: /usr/local/etc/rsnapshot/{{ target.name }}.conf - mode: "0644" - -- name: "Push cryptshot config: {{ target.name }}" - ansible.builtin.template: - src: cryptshot.conf.j2 - dest: /usr/local/etc/cryptshot/{{ target.name }}.conf - mode: "0644" diff --git a/roles/cryptshot/tasks/main.yml b/roles/cryptshot/tasks/main.yml deleted file mode 100644 index d99b82f..0000000 --- a/roles/cryptshot/tasks/main.yml +++ /dev/null @@ -1,64 +0,0 @@ ---- -- name: Install rsnapshot - community.general.pacman: - name: rsnapshot - state: present - -- name: Install cryptshot.sh script - ansible.builtin.copy: - src: cryptshot/cryptshot.sh - dest: /usr/local/bin/cryptshot - mode: "0755" - -- name: Create rsnapshot config directory - ansible.builtin.file: - path: /usr/local/etc/rsnapshot - state: directory - mode: "0755" - -- name: Create cryptshot config directory - ansible.builtin.file: - path: /usr/local/etc/cryptshot - state: directory - mode: "0755" - -- name: Create cryptshot last run directory - ansible.builtin.file: - path: /usr/local/etc/cryptshot/lastrun - state: directory - mode: "0755" - -- name: Include cryptshot config tasks - ansible.builtin.include_tasks: config.yml - with_items: "{{ cryptshot }}" - loop_control: - loop_var: target - -- name: Push cryptshot execution script - ansible.builtin.template: - src: cryptshot.sh.j2 - dest: /usr/local/bin/cryptshot-execute - mode: "0755" - -- name: Push cryptshot service file - ansible.builtin.template: - src: cryptshot.service.j2 - dest: /etc/systemd/system/cryptshot.service - mode: "0644" - notify: - - Reload systemd config - -- name: Push cryptshot timer file - ansible.builtin.template: - src: cryptshot.timer.j2 - dest: /etc/systemd/system/cryptshot.timer - mode: "0644" - notify: - - Reload systemd config - - Restart cryptshot - -- name: Enable and start cryptshot timer - ansible.builtin.service: - name: cryptshot.timer - enabled: true - state: started diff --git a/roles/cryptshot/templates/cryptshot.conf.j2 b/roles/cryptshot/templates/cryptshot.conf.j2 deleted file mode 100644 index 6477497..0000000 --- a/roles/cryptshot/templates/cryptshot.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -UUID="{{ target.uuid }}" -KEYFILE="{{ target.keyfile }}" -BACKUP="/usr/bin/rsnapshot -c /usr/local/etc/rsnapshot/{{ target.name }}.conf" diff --git a/roles/cryptshot/templates/cryptshot.service.j2 b/roles/cryptshot/templates/cryptshot.service.j2 deleted file mode 100644 index b04fc7e..0000000 --- a/roles/cryptshot/templates/cryptshot.service.j2 +++ /dev/null @@ -1,7 +0,0 @@ -Description=Cryptshot Backup Service - -[Service] -Type=oneshot -ExecStart=/usr/local/bin/cryptshot-execute -StandardOutput=journal -StandardError=journal diff --git a/roles/cryptshot/templates/cryptshot.sh.j2 b/roles/cryptshot/templates/cryptshot.sh.j2 deleted file mode 100644 index ff74758..0000000 --- a/roles/cryptshot/templates/cryptshot.sh.j2 +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -{% for target in cryptshot %} -# {{ target.name }} -{% for retain in target.retain|sort(attribute='interval') %} -/usr/local/bin/backitup -q -l /usr/local/etc/cryptshot/lastrun/{{ target.name }}.{{ retain.level }} -b "/usr/local/bin/cryptshot -c /usr/local/etc/cryptshot/{{ target.name }}.conf -i {{ retain.level }}" -p {{ retain.level|upper }} -{% endfor %} -{% endfor %} diff --git a/roles/cryptshot/templates/cryptshot.timer.j2 b/roles/cryptshot/templates/cryptshot.timer.j2 deleted file mode 100644 index eec4fab..0000000 --- a/roles/cryptshot/templates/cryptshot.timer.j2 +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Cryptshot Backup Timer - -[Timer] -Unit=cryptshot.service -OnCalendar=hourly -Persistent=True - -[Install] -WantedBy=timers.target diff --git a/roles/cryptshot/templates/rsnapshot.conf.j2 b/roles/cryptshot/templates/rsnapshot.conf.j2 deleted file mode 100644 index ba950b1..0000000 --- a/roles/cryptshot/templates/rsnapshot.conf.j2 +++ /dev/null @@ -1,234 +0,0 @@ -################################################# -# rsnapshot.conf - rsnapshot configuration file # -################################################# -# # -# PLEASE BE AWARE OF THE FOLLOWING RULE: # -# # -# This file requires tabs between elements # -# # -################################################# - -####################### -# CONFIG FILE VERSION # -####################### - -config_version 1.2 - -########################### -# SNAPSHOT ROOT DIRECTORY # -########################### - -# All snapshots will be stored under this root directory. -# -snapshot_root /mnt/{{ target.uuid }} - -# If no_create_root is enabled, rsnapshot will not automatically create the -# snapshot_root directory. This is particularly useful if you are backing -# up to removable media, such as a FireWire or USB drive. -# -no_create_root 1 - -################################# -# EXTERNAL PROGRAM DEPENDENCIES # -################################# - -# LINUX USERS: Be sure to uncomment "cmd_cp". This gives you extra features. -# EVERYONE ELSE: Leave "cmd_cp" commented out for compatibility. -# -# See the README file or the man page for more details. -# -cmd_cp /usr/bin/cp - -# uncomment this to use the rm program instead of the built-in perl routine. -# -cmd_rm /usr/bin/rm - -# rsync must be enabled for anything to work. This is the only command that -# must be enabled. -# -cmd_rsync /usr/bin/rsync - -# Uncomment this to enable remote ssh backups over rsync. -# -#cmd_ssh /usr/bin/ssh - -# Comment this out to disable syslog support. -# -cmd_logger /usr/bin/logger - -# Uncomment this to specify the path to "du" for disk usage checks. -# If you have an older version of "du", you may also want to check the -# "du_args" parameter below. -# -cmd_du /usr/bin/du - -# Uncomment this to specify the path to rsnapshot-diff. -# -cmd_rsnapshot_diff /usr/bin/rsnapshot-diff - -# Specify the path to a script (and any optional arguments) to run right -# before rsnapshot syncs files -# -#cmd_preexec /path/to/preexec/script - -# Specify the path to a script (and any optional arguments) to run right -# after rsnapshot syncs files -# -#cmd_postexec /path/to/postexec/script - -# Paths to lvcreate, lvremove, mount and umount commands, for use with -# Linux LVMs. -# -#linux_lvm_cmd_lvcreate /path/to/lvcreate -#linux_lvm_cmd_lvremove /path/to/lvremove -#linux_lvm_cmd_mount /usr/bin/mount -#linux_lvm_cmd_umount /usr/bin/umount - -######################################### -# BACKUP LEVELS / INTERVALS # -# Must be unique and in ascending order # -# e.g. alpha, beta, gamma, etc. # -######################################### - -{% for retain in target.retain|sort(attribute='interval', reverse=True) %} -retain {{ retain.level }} {{ retain.interval }} -{% endfor %} - -############################################ -# GLOBAL OPTIONS # -# All are optional, with sensible defaults # -############################################ - -# Verbose level, 1 through 5. -# 1 Quiet Print fatal errors only -# 2 Default Print errors and warnings only -# 3 Verbose Show equivalent shell commands being executed -# 4 Extra Verbose Show extra verbose information -# 5 Debug mode Everything -# -verbose 2 - -# Same as "verbose" above, but controls the amount of data sent to the -# logfile, if one is being used. The default is 3. -# -loglevel 5 - -# If you enable this, data will be written to the file you specify. The -# amount of data written is controlled by the "loglevel" parameter. -# -logfile /var/log/rsnapshot - -# If enabled, rsnapshot will write a lockfile to prevent two instances -# from running simultaneously (and messing up the snapshot_root). -# If you enable this, make sure the lockfile directory is not world -# writable. Otherwise anyone can prevent the program from running. -# -lockfile /var/run/rsnapshot-{{ target.name }}.pid - -# By default, rsnapshot check lockfile, check if PID is running -# and if not, consider lockfile as stale, then start -# Enabling this stop rsnapshot if PID in lockfile is not running -# -#stop_on_stale_lockfile 0 - -# Default rsync args. All rsync commands have at least these options set. -# -rsync_short_args -av -rsync_long_args --delete --numeric-ids --relative --delete-excluded - -# ssh has no args passed by default, but you can specify some here. -# -#ssh_args -p 22 - -# Default arguments for the "du" program (for disk space reporting). -# The GNU version of "du" is preferred. See the man page for more details. -# If your version of "du" doesn't support the -h flag, try -k flag instead. -# -#du_args -csh - -# If this is enabled, rsync won't span filesystem partitions within a -# backup point. This essentially passes the -x option to rsync. -# The default is 0 (off). -# -#one_fs 0 - -# 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. -# -#include ??? -#include ??? -exclude /dev/* -exclude /proc/* -exclude /sys/* -exclude /tmp/* -exclude /var/lib/pacman/sync/* -exclude /var/lib/docker/* -exclude /var/lib/dhcpcd/* -exclude /media/* -exclude /mnt/* -exclude /run/* -exclude lost+found/ -exclude /home/{{ user.name }}/.gvfs - -# The include_file and exclude_file parameters, if enabled, simply get -# passed directly to rsync. Please look up the --include-from and -# --exclude-from options in the rsync man page for more details. -# -#include_file /path/to/include/file -#exclude_file /path/to/exclude/file - -# If your version of rsync supports --link-dest, consider enabling this. -# This is the best way to support special files (FIFOs, etc) cross-platform. -# The default is 0 (off). -# -link_dest 1 - -# When sync_first is enabled, it changes the default behaviour of rsnapshot. -# Normally, when rsnapshot is called with its lowest interval -# (i.e.: "rsnapshot alpha"), it will sync files AND rotate the lowest -# intervals. With sync_first enabled, "rsnapshot sync" handles the file sync, -# and all interval calls simply rotate files. See the man page for more -# details. The default is 0 (off). -# -#sync_first 0 - -# If enabled, rsnapshot will move the oldest directory for each interval -# to [interval_name].delete, then it will remove the lockfile and delete -# that directory just before it exits. The default is 0 (off). -# -#use_lazy_deletes 0 - -# Number of rsync re-tries. If you experience any network problems or -# network card issues that tend to cause ssh to fail with errors like -# "Corrupted MAC on input", for example, set this to a non-zero value -# to have the rsync operation re-tried. -# -#rsync_numtries 0 - -# LVM parameters. Used to backup with creating lvm snapshot before backup -# and removing it after. This should ensure consistency of data in some special -# cases -# -# LVM snapshot(s) size (lvcreate --size option). -# -#linux_lvm_snapshotsize 100M - -# Name to be used when creating the LVM logical volume snapshot(s). -# -#linux_lvm_snapshotname rsnapshot - -# Path to the LVM Volume Groups. -# -#linux_lvm_vgpath /dev - -# Mount point to use to temporarily mount the snapshot(s). -# -#linux_lvm_mountpath /path/to/mount/lvm/snapshot/during/backup - -############################### -### BACKUP POINTS / SCRIPTS ### -############################### - -backup / {{ hostname }}/