fix: add missing init script support for CentOS 6 (#78)

* ci: support optional DH login
* fix: add missing CentOS 6 init script
---------

Signed-off-by: Patrick Stephens <pat@fluent.do>

Author: patrick-stephens

.github/workflows/call-build-linux-packages.yaml

@@ -25,7 +25,7 @@ on:
         description: The Dockerhub username to use for authenticated pulls.
         required: false
         type: string
-        default: "fluentdo"
+        default: ""
       amd-runner-label:
         description: The label to use for the runner (if not specified then the default ubuntu-latest or equivalent is used).
         required: false
@@ -50,7 +50,7 @@ on:
         required: false
       dockerhub-token:
         description: The Dockerhub token to use for authenticated pulls (not pushes).
-        required: true
+        required: false
 jobs:
   build-packages:
     name: agent - ${{ matrix.distro }} package build and upload
@@ -96,6 +96,7 @@ jobs:
           distro: "${{ matrix.distro }}"
 
       - name: Log in to docker.io for authorised pulls
+        if: inputs.dockerhub-username != ''
         uses: docker/login-action@v3
         with:
           username: ${{ inputs.dockerhub-username }}
@@ -149,5 +150,10 @@ jobs:
 
       - name: List RPM package dependencies
         continue-on-error: false
-        run: find source/packaging/packages/ -type f -name '*.rpm' -exec sh -c 'i="$1";echo "$i";docker run --rm -t -v "$PWD/$i":/test.rpm:ro registry.access.redhat.com/ubi9:9.4 yum -q deplist /test.rpm' shell {} \;
+        run: find source/packaging/packages/ -type f -name '*.rpm' -exec sh -c 'i="$1";echo "$i";docker run --rm -t -v "$PWD/$i":/test.rpm:ro registry.access.redhat.com/ubi9:9.5 yum -q deplist /test.rpm' shell {} \;
+        shell: bash
+
+      - name: CentOS 6 checks
+        if: matrix.distro == 'centos/6'
+        run: /bin/bash ./scripts/centos6-init-check.sh
         shell: bash

scripts/centos6-init-check.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+set -eux
+# This does not work with a symlink to this script
+# SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+# See https://stackoverflow.com/a/246128/24637657
+SOURCE=${BASH_SOURCE[0]}
+while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+  SCRIPT_DIR=$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )
+  SOURCE=$(readlink "$SOURCE")
+  # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+  [[ $SOURCE != /* ]] && SOURCE=$SCRIPT_DIR/$SOURCE
+done
+SCRIPT_DIR=$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )
+
+REPO_ROOT=${REPO_ROOT:-$SCRIPT_DIR/..}
+
+# Check for /etc/init.d/xxx script to run the agent
+WORKDIR=${WORKDIR:-/tmp/rpmcontents}
+rm -rf "${WORKDIR:?}/*"
+mkdir -p "$WORKDIR"
+find "$REPO_ROOT/source/packaging/packages/centos/6/" -type f -name '*x86_64.rpm' -print0 |
+while IFS= read -r -d '' line; do
+	echo "Extracting $line"
+	docker run --rm -t \
+		-v "${WORKDIR}:/rpmcontents" \
+		-v "$line:/test.rpm:ro" \
+		registry.access.redhat.com/ubi9:9.5 \
+			/bin/sh -c 'cd /rpmcontents && yum install -y cpio && rpm2cpio /test.rpm | cpio -idmv'
+done
+
+if [[ -f "${WORKDIR}/etc/init.d/fluent-bit" ]]; then
+	echo "INFO: Found fluent-bit init.d script"
+elif [[ -f "${WORKDIR}/etc/init.d/fluentdo-agent" ]]; then
+	echo "INFO: Found fluentdo-agent init.d script"
+else
+	echo "ERROR: Unable to find init.d script"
+	ls -lRh "$WORKDIR"
+	exit 1
+fi

source/CMakeLists.txt

@@ -250,6 +250,9 @@ option(FLB_PREFER_SYSTEM_LIB_NGHTTP2      "Prefer the libnghttp2 system library"
 option(FLB_PREFER_SYSTEM_LIB_SQLITE       "Prefer the libsqlite3 system library"      ${FLB_PREFER_SYSTEM_LIBS})
 option(FLB_PREFER_SYSTEM_LIB_ZSTD         "Prefer the libzstd system library"         ${FLB_PREFER_SYSTEM_LIBS})
 
+# Enable support for CentOS 6 init scripts
+option(FLB_CPACK_SYSVINIT "Enable creation of SysV init scripts after installation" No)
+
 # Enable all features
 if(FLB_ALL)
   # Global
@@ -1560,4 +1563,10 @@ if(FLB_SYSTEM_MACOS)
   endif()
 endif()
 
+# Primarily for legacy (CentOS 6/AL 1) support and workarounds
+if(FLB_CPACK_SYSVINIT)
+  set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cpack/scripts/sysv-init-install.sh)
+  set(CPACK_RPM_PACKAGE_REQUIRES_POST "initscripts")
+endif(FLB_CPACK_SYSVINIT)
+
 include(CPack)

source/Dockerfile

@@ -32,12 +32,12 @@ BEGIN
             VALUE "FileDescription", "Compiled with @CMAKE_C_COMPILER_ID@ @CMAKE_C_COMPILER_VERSION@\0"
             VALUE "ProductVersion", FLB_VER_PRODUCTVERSION_STR
             VALUE "FileVersion", FLB_VER_FILEVERSION_STR
-            VALUE "InternalName", "fluent-bit\0"
-            VALUE "ProductName", "Fluent Bit - Fast and Lightweight Logs and Metrics processor for Linux, BSD, OSX and Windows\0"
-            VALUE "CompanyName", "Calyptia Inc.\0"
-            VALUE "LegalCopyright", "Copyright (C) 2015-2018 Treasure Data Inc.\nCopyright (C) 2019-2021 The Fluent Bit Authors.\nAll rights reserved.\0"
+            VALUE "InternalName", "fluentdo-agent\0"
+            VALUE "ProductName", "FluentDo Agent is an enterprise-hardened distribution of Fluent Bit\0"
+            VALUE "CompanyName", "FluentDo.\0"
+            VALUE "LegalCopyright", "Copyright (C) 2015-2018 Treasure Data Inc.\nCopyright (C) 2019-2025 The Fluent Bit Authors.\nAll rights reserved.\0"
             VALUE "Licence", "Apache-2.0\0"
-            VALUE "Info", "https://docs.fluentbit.io/manual/0"
+            VALUE "Info", "https://docs.fluent.do/0"
         END
     END
 END

source/cmake/version.rc.in

@@ -1 +1,2 @@
-Fluent Bit is a high performance and multi platform Log Forwarder.
+FluentDo Agent is an enterprise-hardened distribution of Fluent Bit, maintained by core OSS maintainers.
+It delivers production-ready log processing with enhanced security, reduced footprint, and enterprise support.

source/cpack/description

@@ -2,8 +2,6 @@ This will install @FLB_OUT_NAME@ on your Mac.
 
 --------------------------------------------------
 
-Thank you for trying @FLB_OUT_NAME@! Have a fantastic day!
-
 You can start / stop @FLB_OUT_NAME@ via launchctl command.
 
 - start @FLB_OUT_NAME@
@@ -14,6 +12,4 @@ You can start / stop @FLB_OUT_NAME@ via launchctl command.
 
 % sudo launchctl unload /Library/LaunchDaemons/@FLB_OUT_NAME@.plist
 
-If you have a question, please ask it on Fluent Bit Community Forum:
-
-https://github.com/fluent/fluent-bit/discussions
+If you require Enterprise support, please contact us via info@fluent.do

source/cpack/macos/welcome.txt.cmakein

@@ -0,0 +1,12 @@
+#!/bin/sh
+NAME=""
+if [ -f /etc/init.d/fluentdo-agent ]; then
+	NAME=fluentdo-agent
+elif [ -f /etc/init.d/fluent-bit ]; then
+	NAME=fluent-bit
+else
+	echo "ERROR: No init.d script found"
+	exit 1
+fi
+chmod a+x /etc/init.d/"$NAME"
+chkconfig --add "$NAME"