Release 7.7.6 - See CHANGELOG.md

tiredofit · Aug 12, 2022 · b45534e · b45534e
1 parent 29ab5a1
commit b45534e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 7.7.6 2022-08-12 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Make logrotate use /etc/logrotate.conf as main configuration
+
+
 ## 7.7.5 2022-08-11 <dave at tiredofit dot ca>
 
    ### Added

diff --git a/install/assets/defaults/05-logging b/install/assets/defaults/05-logging
@@ -43,7 +43,7 @@ FLUENTBIT_TAIL_KEY_OFFSET_ENABLE=${FLUENTBIT_TAIL_KEY_OFFSET_ENABLE:-"FALSE"}
 FLUENTBIT_TAIL_KEY_OFFSET=${FLUENTBIT_TAIL_KEY_OFFSET:-"offset"}
 
 case "$(cat /etc/os-release | grep VERSION_ID | cut -d = -f 2 | cut -d . -f 1,2)" in
-    "3.5" ) LOGROTATE_COMPRESSION_TYPE="gzip" ;;
+    "3.5" | "3.8" ) LOGROTATE_COMPRESSION_TYPE="gzip" ;;
     *) LOGROTATE_COMPRESSION_TYPE=${LOGROTATE_COMPRESSION_TYPE:-"zstd"} ;;
 esac
 

diff --git a/install/etc/cont-init.d/05-logging b/install/etc/cont-init.d/05-logging
@@ -58,7 +58,7 @@ EOF
 # Hardcoded in image in /etc/cont-init.d/$(basename "$0")
 # Generated on $(TZ=${TIMEZONE} date +'%Y-%m-%d %H:%M:%S %Z')
 
-59 23 * * * logrotate -f /etc/logrotate.d/* >/dev/null 2>&1
+59 23 * * * logrotate -f /etc/logrotate.conf >/dev/null 2>&1
 EOF
 fi