Adjust Borgmatic arguments for v1.7.0 (#102)

borgbase · Sep 3, 2022 · e1ba1d1 · e1ba1d1
1 parent 1def545
commit e1ba1d1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/meta/main.yml b/meta/main.yml
@@ -18,7 +18,7 @@ galaxy_info:
         - trusty
         - xenial
         - bionic
-    - name: Archlinux
+    - name: ArchLinux
       versions:
         - all
   galaxy_tags:

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -10,6 +10,8 @@ platforms:
     image: centos:7
   - name: almalinux-8
     image: almalinux:8
+  - name: almalinux-9
+    image: almalinux:9
   - name: fedora-latest
     image: fedora:latest
   - name: debian-bullseye

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -93,7 +93,7 @@
         minute: "{{ borgmatic_cron_minute }}"
         user: "root"
         cron_file: "{{ borgmatic_cron_name }}"
-        job: "borgmatic -c /etc/borgmatic/{{ borgmatic_config_name }} --create --prune"
+        job: "borgmatic -c /etc/borgmatic/{{ borgmatic_config_name }} -C -p"
     - name: Add cron job for infrequent checks
       cron:
         name: "{{ borgmatic_cron_name }}-check"
@@ -102,7 +102,7 @@
         minute: "{{ borgmatic_cron_checks_minute }}"
         user: "root"
         cron_file: "{{ borgmatic_cron_name }}"
-        job: "borgmatic -c /etc/borgmatic/{{ borgmatic_config_name }} --check"
+        job: "borgmatic -c /etc/borgmatic/{{ borgmatic_config_name }} -k"
   when: borgmatic_large_repo
 
 - name: Add cron-job for borgmatic (normal-sized repo)

diff --git a/vars/Archlinux.yml b/vars/Archlinux.yml
@@ -5,6 +5,7 @@ borg_packages:
   - openssh
   - pkgconfig
   - python-pip
+  - python-setuptools
 
 python_bin: python3
 pip_bin: pip3
diff --git a/vars/RedHat-9.yml b/vars/RedHat-9.yml
@@ -6,10 +6,10 @@ borg_packages:
   - gcc-c++
   - openssl-devel
   - python3-pip
-  - python3-wheel
+  # - python3-wheel
   - python3-devel
   - python3-setuptools
-  - python3-virtualenv
+  # - python3-virtualenv
   - openssh-clients
   - cronie