code_public/logcorrelator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(rpm): example config in /etc/logcorrelator + socket permissions 0666
Some checks failed
Build and Test / test (push) Has been cancelled
Details
Build and Test / build (push) Has been cancelled
Details
Build and Test / docker (push) Has been cancelled
Details

Browse Source 
- Install logcorrelator.yml.example to /etc/logcorrelator/ instead of /usr/share/logcorrelator/
- Change default socket permissions from 0660 to 0666 (world read/write)
- Bump version to 1.1.2
- Remove CHANGELOG.md

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
This commit is contained in:
Jacquin Antoine
2026-03-02 22:07:50 +01:00
parent ef819e8868
commit 324b0042f8
8 changed files with 23 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Dockerfile.package
View File

@ -46,7 +46,7 @@ RUN dnf install -y epel-release && \
# Copy binary from builder
COPY --from=builder /build/dist/logcorrelator /tmp/pkgroot/usr/bin/logcorrelator
COPY --from=builder /build/config.example.yml /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml
COPY --from=builder /build/config.example.yml /tmp/pkgroot/usr/share/logcorrelator/logcorrelator.yml.example
COPY --from=builder /build/config.example.yml /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml.example
COPY --from=builder /build/logcorrelator.service /tmp/pkgroot/etc/systemd/system/logcorrelator.service
COPY --from=builder /build/CHANGELOG.md /tmp/pkgroot/usr/share/doc/logcorrelator/CHANGELOG.md
COPY packaging/rpm/post /tmp/scripts/post
@ -61,7 +61,7 @@ RUN mkdir -p /tmp/pkgroot/var/log/logcorrelator && \
mkdir -p /tmp/pkgroot/usr/share/doc/logcorrelator && \
chmod 755 /tmp/pkgroot/usr/bin/logcorrelator && \
chmod 640 /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml && \
chmod 640 /tmp/pkgroot/usr/share/logcorrelator/logcorrelator.yml.example && \
chmod 640 /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml.example && \
chmod 644 /tmp/pkgroot/etc/systemd/system/logcorrelator.service && \
chmod 755 /tmp/scripts/* && \
chmod 755 /tmp/pkgroot/var/log/logcorrelator && \
@ -88,7 +88,7 @@ RUN mkdir -p /packages/rpm/el8 && \
-p /packages/rpm/el8/logcorrelator-${VERSION}-1.el8.x86_64.rpm \
usr/bin/logcorrelator \
etc/logcorrelator/logcorrelator.yml \
usr/share/logcorrelator/logcorrelator.yml.example \
etc/logcorrelator/logcorrelator.yml.example \
usr/share/doc/logcorrelator/CHANGELOG.md \
var/log/logcorrelator \
var/run/logcorrelator \
@ -111,7 +111,7 @@ RUN dnf install -y epel-release && \
# Copy binary from builder
COPY --from=builder /build/dist/logcorrelator /tmp/pkgroot/usr/bin/logcorrelator
COPY --from=builder /build/config.example.yml /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml
COPY --from=builder /build/config.example.yml /tmp/pkgroot/usr/share/logcorrelator/logcorrelator.yml.example
COPY --from=builder /build/config.example.yml /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml.example
COPY --from=builder /build/logcorrelator.service /tmp/pkgroot/etc/systemd/system/logcorrelator.service
COPY --from=builder /build/CHANGELOG.md /tmp/pkgroot/usr/share/doc/logcorrelator/CHANGELOG.md
COPY packaging/rpm/post /tmp/scripts/post
@ -126,7 +126,7 @@ RUN mkdir -p /tmp/pkgroot/var/log/logcorrelator && \
mkdir -p /tmp/pkgroot/usr/share/doc/logcorrelator && \
chmod 755 /tmp/pkgroot/usr/bin/logcorrelator && \
chmod 640 /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml && \
chmod 640 /tmp/pkgroot/usr/share/logcorrelator/logcorrelator.yml.example && \
chmod 640 /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml.example && \
chmod 644 /tmp/pkgroot/etc/systemd/system/logcorrelator.service && \
chmod 755 /tmp/scripts/* && \
chmod 755 /tmp/pkgroot/var/log/logcorrelator && \
@ -153,7 +153,7 @@ RUN mkdir -p /packages/rpm/el9 && \
-p /packages/rpm/el9/logcorrelator-${VERSION}-1.el9.x86_64.rpm \
usr/bin/logcorrelator \
etc/logcorrelator/logcorrelator.yml \
usr/share/logcorrelator/logcorrelator.yml.example \
etc/logcorrelator/logcorrelator.yml.example \
usr/share/doc/logcorrelator/CHANGELOG.md \
var/log/logcorrelator \
var/run/logcorrelator \
@ -176,7 +176,7 @@ RUN dnf install -y epel-release && \
# Copy binary from builder
COPY --from=builder /build/dist/logcorrelator /tmp/pkgroot/usr/bin/logcorrelator
COPY --from=builder /build/config.example.yml /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml
COPY --from=builder /build/config.example.yml /tmp/pkgroot/usr/share/logcorrelator/logcorrelator.yml.example
COPY --from=builder /build/config.example.yml /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml.example
COPY --from=builder /build/logcorrelator.service /tmp/pkgroot/etc/systemd/system/logcorrelator.service
COPY --from=builder /build/CHANGELOG.md /tmp/pkgroot/usr/share/doc/logcorrelator/CHANGELOG.md
COPY packaging/rpm/post /tmp/scripts/post
@ -191,7 +191,7 @@ RUN mkdir -p /tmp/pkgroot/var/log/logcorrelator && \
mkdir -p /tmp/pkgroot/usr/share/doc/logcorrelator && \
chmod 755 /tmp/pkgroot/usr/bin/logcorrelator && \
chmod 640 /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml && \
chmod 640 /tmp/pkgroot/usr/share/logcorrelator/logcorrelator.yml.example && \
chmod 640 /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml.example && \
chmod 644 /tmp/pkgroot/etc/systemd/system/logcorrelator.service && \
chmod 755 /tmp/scripts/* && \
chmod 755 /tmp/pkgroot/var/log/logcorrelator && \
@ -218,7 +218,7 @@ RUN mkdir -p /packages/rpm/el10 && \
-p /packages/rpm/el10/logcorrelator-${VERSION}-1.el10.x86_64.rpm \
usr/bin/logcorrelator \
etc/logcorrelator/logcorrelator.yml \
usr/share/logcorrelator/logcorrelator.yml.example \
etc/logcorrelator/logcorrelator.yml.example \
usr/share/doc/logcorrelator/CHANGELOG.md \
var/log/logcorrelator \
var/run/logcorrelator \