diff --git a/CHANGELOG.md b/CHANGELOG.md index c36e3de0..340bfb99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ The **patch** part changes is incremented if multiple releases happen the same m ### Changed * evocheck: upstream release 22.08.1 +* evolinux-base: update-evobackup-canary upstream release 22.06 * generate-ldif: Support any MariaDB version * minifirewall: use handlers to restart minifirewall * openvpn: automate the initialization of the CA and the creation of the server certificate ; use openssl_dhparam module instead of a command diff --git a/evolinux-base/files/update-evobackup-canary.sh b/evolinux-base/files/update-evobackup-canary similarity index 95% rename from evolinux-base/files/update-evobackup-canary.sh rename to evolinux-base/files/update-evobackup-canary index 20fc1a57..868c3be6 100644 --- a/evolinux-base/files/update-evobackup-canary.sh +++ b/evolinux-base/files/update-evobackup-canary @@ -3,7 +3,7 @@ PROGNAME="update-evobackup-canary" REPOSITORY="https://gitea.evolix.org/evolix/evobackup" -VERSION="22.05" +VERSION="22.06" readonly VERSION # base functions @@ -44,8 +44,8 @@ main() { if [ -z "${canary_file:-}" ]; then canary_file="/zzz_evobackup_canary" fi - # This option is supported since (at least) Debian 8 - date=$(date --iso-8601=seconds) + # This option is supported both on OpenBSD which does not use GNU date and on Debian + date=$(date "+%FT%T%z") printf "%s %s\n" "${date}" "${who}" >> "${canary_file}" } diff --git a/evolinux-base/tasks/utils.yml b/evolinux-base/tasks/utils.yml index 8236bd92..2fd4b0c1 100644 --- a/evolinux-base/tasks/utils.yml +++ b/evolinux-base/tasks/utils.yml @@ -17,7 +17,7 @@ - name: update-evobackup-canary script is present copy: - src: "update-evobackup-canary.sh" + src: update-evobackup-canary dest: /usr/local/bin/update-evobackup-canary force: True owner: root @@ -30,11 +30,11 @@ path: /usr/local/sbin/update-evobackup-canary state: absent -- name: dir-check script is present - copy: - src: "dir-check.sh" - dest: /usr/local/bin/dir-check - force: True - owner: root - group: root - mode: "0755" \ No newline at end of file +# - name: dir-check script is present +# copy: +# src: "dir-check.sh" +# dest: /usr/local/bin/dir-check +# force: True +# owner: root +# group: root +# mode: "0755" \ No newline at end of file