From 7eb143e904931653c1c93dec5e39a75f9b5540a6 Mon Sep 17 00:00:00 2001 From: Jacquin Antoine Date: Mon, 2 Mar 2026 21:40:33 +0100 Subject: [PATCH] fix(rpm): install logcorrelator.yml.example in /etc/logcorrelator/ Move example config from /usr/share/logcorrelator/ to /etc/logcorrelator/ for easier access and consistency with main config file. Bump version to 1.1.1 Co-authored-by: Qwen-Coder --- packaging/rpm/logcorrelator.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packaging/rpm/logcorrelator.spec b/packaging/rpm/logcorrelator.spec index c5aef55..f9ae0ec 100644 --- a/packaging/rpm/logcorrelator.spec +++ b/packaging/rpm/logcorrelator.spec @@ -2,7 +2,7 @@ # Compatible with CentOS 7, Rocky Linux 8, 9, 10 # Define version before Version: field for RPM macro support -%global spec_version 1.1.0 +%global spec_version 1.1.1 Name: logcorrelator Version: %{spec_version} @@ -34,7 +34,6 @@ réseau, et produit des logs corrélés en temps réel vers ClickHouse et/ou fic %install mkdir -p %{buildroot}/usr/bin mkdir -p %{buildroot}/etc/logcorrelator -mkdir -p %{buildroot}/usr/share/logcorrelator mkdir -p %{buildroot}/var/log/logcorrelator mkdir -p %{buildroot}/var/run/logcorrelator mkdir -p %{buildroot}/etc/systemd/system @@ -45,7 +44,7 @@ install -m 0755 %{_sourcedir}/logcorrelator %{buildroot}/usr/bin/logcorrelator # Install config install -m 0640 %{_sourcedir}/logcorrelator.yml %{buildroot}/etc/logcorrelator/logcorrelator.yml -install -m 0640 %{_sourcedir}/logcorrelator.yml %{buildroot}/usr/share/logcorrelator/logcorrelator.yml.example +install -m 0640 %{_sourcedir}/logcorrelator.yml %{buildroot}/etc/logcorrelator/logcorrelator.yml.example # Install systemd service install -m 0644 %{_sourcedir}/logcorrelator.service %{buildroot}/etc/systemd/system/logcorrelator.service @@ -86,7 +85,7 @@ chmod 750 /etc/logcorrelator # Copy default config if not exists if [ ! -f /etc/logcorrelator/logcorrelator.yml ]; then - cp /usr/share/logcorrelator/logcorrelator.yml.example /etc/logcorrelator/logcorrelator.yml + cp /etc/logcorrelator/logcorrelator.yml.example /etc/logcorrelator/logcorrelator.yml chown logcorrelator:logcorrelator /etc/logcorrelator/logcorrelator.yml chmod 640 /etc/logcorrelator/logcorrelator.yml fi @@ -113,14 +112,17 @@ fi %files /usr/bin/logcorrelator /etc/logcorrelator/logcorrelator.yml +/etc/logcorrelator/logcorrelator.yml.example %config(noreplace) /etc/logcorrelator/logcorrelator.yml -/usr/share/logcorrelator/logcorrelator.yml.example /var/log/logcorrelator /var/run/logcorrelator /etc/systemd/system/logcorrelator.service /etc/logrotate.d/logcorrelator %changelog +* Mon Mar 02 2026 logcorrelator - 1.1.1-1 +- Fix: Move logcorrelator.yml.example from /usr/share/logcorrelator/ to /etc/logcorrelator/ + * Mon Mar 02 2026 logcorrelator - 1.1.0-1 - Feat: Keep-Alive support (one-to-many correlation mode) - Feat: Dynamic TTL for network events (source B)