From aaabe48e767e64d3cc8c7e0f691bd4c4da8fae11 Mon Sep 17 00:00:00 2001 From: Florian Apolloner Date: Mon, 1 Jan 2024 20:58:37 +0100 Subject: [PATCH] Switch to linuxnew64 packages. --- CHANGELOG.md | 6 ++++++ README.md | 2 +- defaults/main.yml | 6 +++--- molecule/default/tests/test_backup_upstream.py | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5f6124..d64f544 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 4.0.0 (2024-01-01) + + - INCOMPATIBLE: Switch default upstream binaries to linuxnew64. They don't work on CentOS 7 and other + old systems. One can still adjust `borgbackup_upstream_url`/`borgbackup_upstream_checksum` accordingly. + - Updated default borg version to 1.2.7. + ## 3.0.6 (2024-01-01) - Disable SSH passwort authentication to prevent hanging if the ssh keyfile is not found. diff --git a/README.md b/README.md index 3a19842..962aadf 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ The role allows installation via the OS package manager (default) as well as dir ``` borgbackup_install_method: system|upstream ``` -If upstream is chosen, one needs to specify version and checksum (defaults to version `1.1.15`): +If upstream is chosen, one needs to specify version and checksum (defaults to version `1.2.7`): ``` borgbackup_upstream_version: 1.1.15 borgbackup_upstream_checksum: sha256:7848d1788b5d7f2ae99a599a87992cab4f01584fe5eb393819fceaecf076433b diff --git a/defaults/main.yml b/defaults/main.yml index 32f2f66..34b1455 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -5,9 +5,9 @@ borgbackup_install_method: system # system package to install, there should be no need to change this borgbackup_system_package_name: borgbackup -borgbackup_upstream_version: 1.1.15 -borgbackup_upstream_checksum: sha256:9e87a2b19a6d1034abedf3265bbf5f063238246fc56e6087b6ec4a21f29b4239 -borgbackup_upstream_url: https://github.com/borgbackup/borg/releases/download/{{ borgbackup_upstream_version }}/borg-linux64 +borgbackup_upstream_version: 1.2.7 +borgbackup_upstream_checksum: sha256:d8d3313ebaf48ba135001b7f230b494259f112e56adf0d5f952af999742e1190 +borgbackup_upstream_url: https://github.com/borgbackup/borg/releases/download/{{ borgbackup_upstream_version }}/borg-linuxnew64 borgbackup_user: borg borgbackup_home: "{% if borgbackup_user == 'root' %}/root/borg{% else %}/home/{{ borgbackup_user }}{% endif %}" diff --git a/molecule/default/tests/test_backup_upstream.py b/molecule/default/tests/test_backup_upstream.py index c951b3a..e0cf80f 100644 --- a/molecule/default/tests/test_backup_upstream.py +++ b/molecule/default/tests/test_backup_upstream.py @@ -7,7 +7,7 @@ def test_upstream_borg_installed(host): cmd = host.run("/usr/local/bin/borg --version") # Show the error output if it is not possible to start borg assert cmd.stderr.strip() == "" - assert cmd.stdout.strip() == "borg 1.1.15" + assert cmd.stdout.strip() == "borg 1.2.7" def test_backup(host):