diff --git a/ansible.cfg b/ansible.cfg index ede5856..81f79cb 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -2,7 +2,7 @@ inventory = hosts interpreter_python = auto_silent nocows = 1 -timeout= 30 +timeout= 60 force_valid_group_names = ignore private_key_file = ~/.ssh/id_rsa diff --git a/bin/borg-daily b/bin/borg-daily index 1151106..b15cd41 100755 --- a/bin/borg-daily +++ b/bin/borg-daily @@ -19,7 +19,7 @@ # 0.2.0 PURPOSE="SYSTEM" TARGET_HOST="" -LOCATION="/tank/borg/" +LOCATION="/backup/Backup-Repo/borg/" BORG_REPO="${HOSTNAME}" TARGET="${TARGET_HOST}${LOCATION}${BORG_REPO}" ARC_NAME="${HOSTNAME}+${USER}:$(date +"%Y%m%dT%H%M%S")" diff --git a/bin/borg-prune b/bin/borg-prune index ecf4862..eb5e46c 100755 --- a/bin/borg-prune +++ b/bin/borg-prune @@ -19,11 +19,11 @@ # 0.2.0 PURPOSE="SYSTEM" TARGET_HOST="" -LOCATION="/tank/borg/" +LOCATION="/tank/borg" BORG_REPO="${HOSTNAME}" ARC_NAME="${HOSTNAME}+${USER}:$(date +"%Y%m%dT%H%M%S")" BORG_COMMENT="Automated \"${PURPOSE}\" backup to repository \"${BORG_REPO}\" at \"${TARGET_HOST}${LOCATION}\" issued $(date +"%Y-%m-%dT%H:%M:%S")." -BORG_OPTS="--keep-within 31d" +BORG_OPTS="--keep-within 15d" LOGFILE_LOCATION="/tmp" LOGFILE="borg-${PURPOSE}_$(date +"%Y%m%dT%H%M%S").log" export BORG_RELOCATED_REPO_ACCESS_IS_OK=yes diff --git a/initpi.yml b/initpi.yml index 752f421..7d08a33 100644 --- a/initpi.yml +++ b/initpi.yml @@ -5,6 +5,7 @@ roles: - initpi - installpkg + - mountbackup - installsoft - log2ram - disableswap diff --git a/roles/mountbackup/tasks/.main.yml.swp b/roles/mountbackup/tasks/.main.yml.swp deleted file mode 100644 index 2e5a57b..0000000 Binary files a/roles/mountbackup/tasks/.main.yml.swp and /dev/null differ diff --git a/roles/updatepi/tasks/main.yml b/roles/updatepi/tasks/main.yml index b7f42a7..6d5a178 100644 --- a/roles/updatepi/tasks/main.yml +++ b/roles/updatepi/tasks/main.yml @@ -5,4 +5,8 @@ update_cache: yes cache_valid_time: 120 autoremove: yes +- name: Pi Neustart if /var/run/reboot-reqired exists + command: shutdown -r now + args: + removes: /var/run/reboot-required