Skip to content

Commit

Permalink
conf changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Dr-N00B committed Jul 17, 2024
1 parent fb86128 commit 5699611
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 13 deletions.
5 changes: 0 additions & 5 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -777,11 +777,6 @@ base-image:

IF [ "$OS_DISTRIBUTION" = "sles" ]
RUN if [ ! -e /usr/bin/apparmor_parser ]; then cp /sbin/apparmor_parser /usr/bin/apparmor_parser; fi
# https://software.opensuse.org//download.html?project=home%3Argerhards&package=rsyslog
# RUN zypper -n addrepo https://download.opensuse.org/repositories/home:rgerhards/SLE_15/home:rgerhards.repo

RUN zypper refresh
RUN zypper install rsyslog
END

DO +OS_RELEASE --OS_VERSION=$KAIROS_VERSION
Expand Down
7 changes: 3 additions & 4 deletions overlay/files/etc/rsyslog.d/51-stylus-rsyslog.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# create stylus-audit.log with 600
$FileOwner root
$FileGroup adm
$FileCreateMode 0600
:syslogfacility-text=auth, :syslogseverity-text=notice, :syslogtag, "stylus-audit" /var/log/stylus-audit.log

# restore the default file permissions
$FileCreateMode 0640
auth.=notice /var/log/stylus-audit.log
2 changes: 1 addition & 1 deletion rhel-core-images/Dockerfile.rhel8
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ RUN uuidgen > /etc/machine-id && dnf install -y \
iscsi-initiator-utils \
iptables ethtool socat iproute-tc conntrack \
kernel kernel-modules kernel-modules-extra \
rsync jq rsyslog logrotate && dnf clean all
rsync jq && dnf clean all


COPY --from=quay.io/kairos/framework:v2.7.41 / /
Expand Down
2 changes: 1 addition & 1 deletion rhel-fips/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ RUN uuidgen > /etc/machine-id && dnf install -y \
iscsi-initiator-utils \
iptables ethtool socat iproute-tc conntrack \
kernel kernel-modules kernel-modules-extra \
rsync jq rsyslog logrotate && dnf clean all
rsync jq && dnf clean all

RUN mkdir -p /run/lock && \
touch /usr/libexec/.keep
Expand Down
2 changes: 0 additions & 2 deletions ubuntu-fips/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,6 @@ RUN apt-get install -y --no-install-recommends \
zerofree \
zfsutils-linux \
zstd \
rsyslog \
logrotate \
&& apt-get remove -y unattended-upgrades && apt-get clean \
&& apt-get purge --auto-remove -y ubuntu-advantage-tools \
&& rm -rf /var/lib/apt/lists/*
Expand Down

0 comments on commit 5699611

Please sign in to comment.