Skip to content

Commit 279770c

Browse files
authored
Merge pull request #207 from matyasselmeci/pr/no-rsyslog-root
Do not try to capture syslog; this means we don't have to run rsyslog as root
2 parents ca86532 + 456b19e commit 279770c

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ RUN if [[ -z "$NO_EXPANSE_USER" ]]; then \
185185
fi
186186

187187
COPY --from=compile /launch_rsyslogd /usr/bin/launch_rsyslogd
188-
RUN chmod 04755 /usr/bin/launch_rsyslogd && \
188+
RUN chmod 755 /usr/bin/launch_rsyslogd && \
189189
mkdir -p /etc/pki/rsyslog && chmod 01777 /etc/pki/rsyslog && \
190190
ln -sf /usr/share/zoneinfo/UTC /etc/localtime
191191

rsyslog.conf

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ DefaultNetstreamDriverCertFile="/etc/pki/rsyslog/tls.crt"
55
DefaultNetstreamDriverKeyFile="/etc/pki/rsyslog/tls.key"
66
)
77

8-
# Listen to the traditional syslog Unix socket.
9-
module(
10-
load="imuxsock"
11-
SysSock.Unlink="off"
12-
SysSock.UsePIDFromSystem="on"
13-
)
14-
158
# Look for condor logfiles
169
module(
1710
load="imfile"

0 commit comments

Comments
 (0)