diff options
| author | Matthias Schiffer <matthias.schiffer@ew.tq-group.com> | 2020-04-08 14:32:32 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-04-09 15:13:03 +0200 |
| commit | 7401834437535fad962fb0f68dcdddc93d212935 (patch) | |
| tree | 7dc357dba5a189cc58947da33ae0d8565c6adba5 /projectroot | |
| parent | 94debc29986dc6d17fd0329b706fc3ea3a9e9a9c (diff) | |
| download | ptxdist-7401834437535fad962fb0f68dcdddc93d212935.tar.gz ptxdist-7401834437535fad962fb0f68dcdddc93d212935.tar.xz | |
syslogng: update to 3.25.1
Update and move out of staging. The new version adds compatiblity with
OpenSSL 1.1.x and switches to Python 3.
The AMQP and MongoDB destinations are removed, they were never buildable
without additional packages not available in plain PTXdist. Various
other modules are disabled explicitly to avoid the build
nondeterministically picking up undeclared dependencies.
A simple replacement for the old systemd unit is added, as the new version
only provides an instanced unit which cannot be linked as syslog.service
(which is necessary to use syslog-ng as the default system logger by
enabling ForwardToSyslog in journald.conf).
Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Message-Id: <20200408123232.12718-1-matthias.schiffer@ew.tq-group.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'projectroot')
| -rw-r--r-- | projectroot/etc/syslog-ng.conf | 6 | ||||
| -rw-r--r-- | projectroot/usr/lib/systemd/system/syslog-ng.service | 20 |
2 files changed, 24 insertions, 2 deletions
diff --git a/projectroot/etc/syslog-ng.conf b/projectroot/etc/syslog-ng.conf index 254aecfd2..0235b9857 100644 --- a/projectroot/etc/syslog-ng.conf +++ b/projectroot/etc/syslog-ng.conf @@ -1,13 +1,15 @@ # -# syslog-ng configuration +# syslog-ng configuration # +@version: 3.25 + # # Options # # sync every 0 lines -options { long_hostnames(off); sync(0); }; +options { chain_hostnames(off); flush_lines(0); }; # # Sources diff --git a/projectroot/usr/lib/systemd/system/syslog-ng.service b/projectroot/usr/lib/systemd/system/syslog-ng.service new file mode 100644 index 000000000..6bf591efd --- /dev/null +++ b/projectroot/usr/lib/systemd/system/syslog-ng.service @@ -0,0 +1,20 @@ +[Unit] +Description=System Logger Daemon +Documentation=man:syslog-ng(8) +Conflicts=emergency.service emergency.target +Requires=syslog.socket +Wants=network.target network-online.target +After=network.target network-online.target + +[Service] +Type=notify +ExecStartPre=/bin/mkdir -p /var/lib/syslog-ng +ExecStart=/usr/sbin/syslog-ng -F --enable-core --cfgfile /etc/syslog-ng.conf --control /var/run/syslog-ng.ctl --persist-file /var/lib/syslog-ng/syslog-ng.persist --pidfile /var/run/syslog-ng.pid +ExecReload=/bin/kill -HUP $MAINPID +StandardOutput=journal +StandardError=journal +Restart=on-failure + +[Install] +Alias=syslog.service +WantedBy=multi-user.target |