roles/restic/defaults/main.yaml

@@ -4,9 +4,9 @@ restic_service_state: started
 restic_service_enabled: yes
 
 restic_arch: amd64
-restic_version: 0.14.0
+restic_version: 0.9.6
 restic_url: "https://github.com/restic/restic/releases/download/v{{ restic_version }}/restic_{{ restic_version }}_linux_{{ restic_arch }}.bz2"
-restic_checksum: sha256:c8da7350dc334cd5eaf13b2c9d6e689d51e7377ba1784cc6d65977bd44ee1165
+restic_checksum: sha256:a88ca09d1dd051d470965667a224a2b81930c6628a0566b7b17868be40207dc8
 restic_bin_path: /usr/local/bin
 restic_etc_path: /etc/restic
 restic_path: "{{ restic_bin_path }}/restic"
@@ -25,5 +25,3 @@ restic_global_exclude:
 
 restic_repos: []
 restic_jobs: []
-
-restic_tidy_enabled: false

roles/restic/files/hooks/gitea.sh

@@ -9,7 +9,7 @@ GITEA_CONFIG=${GITEA_CONFIG:-/etc/gitea/app.ini}
 GITEA_WORK_PATH=${GITEA_WORK_PATH:-/var/lib/gitea}
 GITEA_CUSTOM_PATH=${GITEA_CUSTOM_PATH:-$GITEA_WORK_PATH/custom}
 GITEA_BACKUP_PATH=${GITEA_BACKUP_PATH:-$GITEA_WORK_PATH/backup}
-GITEA_KEEP_DAYS=${GITEA_KEEP_DAYS:-2}
+GITEA_KEEP_DAYS=${GITEA_KEEP_DAYS:-7}
 
 prereq() {
     if ! systemctl list-units --full --all | grep -Fq "gitea.service"; then

roles/restic/tasks/repo.yaml

@@ -62,4 +62,3 @@
     user: root
     state: present
     job: "( {{ restic_bin_path }}/restic-tidy {{ item.name }} | logger --id=$$ -t restic-tidy -p user.info ) 2>&1 | logger --id=$$ -t restic-tidy -p user.err"
-  when: restic_tidy_enabled

roles/rsyslog/defaults/main.yaml

@@ -1,7 +1,5 @@
 ---
-rsyslog_package_name:
+rsyslog_package_name: rsyslog
-  - rsyslog
-  - rsyslog-relp
 rsyslog_package_state: present
 
 rsyslog_service_name: rsyslog
@@ -21,7 +19,6 @@ rsyslog_load_modules:
       permitnonkernelfacility: "on"
   - name: imtcp
   - name: imudp
-  - name: imrelp
 
 rsyslog_work_directory: /var/spool/rsyslog
 rsyslog_include_config: /etc/rsyslog.d/*.conf

roles/rsyslog/tasks/archival.yaml

@@ -68,7 +68,7 @@
     minute: "0"
     hour: "1"
     user: root
-    job: find /var/log/syslog/ -mindepth 4 -type f -name "*.log" ! -newerct 00:00:00 -exec nice xz -f {} \;
+    job: find /var/log/syslog/ -mindepth 4 -type f -name "*.log" -mtime +5 -exec xz {} \;
     state: "{{ rsyslog_archival_format_enabled | ternary('present', 'absent') }}"
 
 - name: purge log cron job

roles/rsyslog/tasks/main.yaml

@@ -7,9 +7,8 @@
 
 - name: install package
   package:
-    name: "{{ item }}"
+    name: "{{ rsyslog_package_name }}"
     state: "{{ rsyslog_package_state }}"
-  loop: "{{ rsyslog_package_name }}"
 
 - name: configure
   template: