summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-09-28 19:14:24 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-09-28 19:14:24 +0000
commitd3df23408df01ab0d4ea7a5f67be8a35ae64ccb8 (patch)
tree2bba998fb933330adc086d6b523199ed61ca1a6e
parentAdding upstream version 20210926. (diff)
downloadopen-infrastructure-service-tools-d3df23408df01ab0d4ea7a5f67be8a35ae64ccb8.tar.xz
open-infrastructure-service-tools-d3df23408df01ab0d4ea7a5f67be8a35ae64ccb8.zip
Adding upstream version 20210928.upstream/20210928
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--CHANGELOG.txt8
-rw-r--r--VERSION.txt2
-rwxr-xr-xdehydrated/bin/dehydrated-cron3
-rwxr-xr-xgit/bin/git-repo-repack2
4 files changed, 13 insertions, 2 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8a26178..cf850f3 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,11 @@
+2021-09-28 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+
+ * Releasing version 20210928.
+
+ [ Daniel Baumann ]
+ * Changing variable usage and quoting for 'git gc' options to fix git-repo-repack with newer git versions.
+ * Actually run dehydrated in dehydrated-cron.
+
2021-09-26 Daniel Baumann <daniel.baumann@open-infrastructure.net>
* Releasing version 20210926.
diff --git a/VERSION.txt b/VERSION.txt
index c2d5f99..fbdb929 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-20210926
+20210928
diff --git a/dehydrated/bin/dehydrated-cron b/dehydrated/bin/dehydrated-cron
index 8264761..8e7904c 100755
--- a/dehydrated/bin/dehydrated-cron
+++ b/dehydrated/bin/dehydrated-cron
@@ -22,5 +22,8 @@
set -e
mkdir -p /var/log/dehydrated
+
+dehydrated -c >> /var/log/dehydrated/dehydrated.log
dehydrated -gcd >> /var/log/dehydrated/dehydrated.log
+
chown -R root:adm /var/log/dehydrated
diff --git a/git/bin/git-repo-repack b/git/bin/git-repo-repack
index 0d3c106..58f909d 100755
--- a/git/bin/git-repo-repack
+++ b/git/bin/git-repo-repack
@@ -51,7 +51,7 @@ do
cd "${REPOSITORY}"
git repack "${GIT_REPACK_OPTIONS}" -a -b -d -f -F
- git gc "${GIT_GC_OPTIONS}" --aggressive --prune
+ git gc --aggressive --prune ${GIT_GC_OPTIONS}
cd "${OLDPWD}"
if [ "$(id -u)" -eq "0" ]