X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=syslog-ng-systemd.patch;h=69f763d2d6bc1132fa4833f67a0cdd3c547b6572;hb=224a3efe3908e27819fcdb7e1d0529b6484ad9cf;hp=809f8f2d52568413c8c321c868884ce90f98bcea;hpb=1752426447fc8554b117ed36886b4fc899d337a8;p=packages%2Fsyslog-ng.git

diff --git a/syslog-ng-systemd.patch b/syslog-ng-systemd.patch
index 809f8f2..69f763d 100644
--- a/syslog-ng-systemd.patch
+++ b/syslog-ng-systemd.patch
@@ -1,14 +1,23 @@
---- syslog-ng-3.3.1/contrib/systemd/syslog-ng.service~	2011-09-09 09:14:53.000000000 +0200
-+++ syslog-ng-3.3.1/contrib/systemd/syslog-ng.service	2011-11-29 18:24:53.010449488 +0100
-@@ -2,9 +2,10 @@
- Description=System Logger Daemon
+diff -dur -x '*~' syslog-ng-syslog-ng-3.14.1.orig/contrib/systemd/syslog-ng@.service syslog-ng-syslog-ng-3.14.1/contrib/systemd/syslog-ng@.service
+--- syslog-ng-syslog-ng-3.14.1.orig/contrib/systemd/syslog-ng@.service	2018-02-26 15:32:28.000000000 +0100
++++ syslog-ng-syslog-ng-3.14.1/contrib/systemd/syslog-ng@.service	2018-03-30 15:38:31.000000000 +0200
+@@ -5,13 +5,17 @@
  
  [Service]
-+EnvironmentFile=/etc/sysconfig/syslog-ng
- Sockets=syslog.socket
- ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
--ExecStart=/usr/sbin/syslog-ng -F
-+ExecStart=/sbin/syslog-ng -F -f /etc/syslog-ng/syslog-ng.conf --worker-threads=1024
+ Type=notify
++Environment=CONFIG_FILE=/etc/syslog-ng/syslog-ng.conf
++Environment=PID_FILE=/var/run/syslogd.pid
++Environment=PERSIST_FILE=/var/lib/syslog-ng/syslog-ng.persist
++Environment=CONTROL_FILE=/var/lib/syslog-ng/syslog-ng.ctl
+ EnvironmentFile=-/etc/default/syslog-ng@%i
+ EnvironmentFile=-/etc/sysconfig/syslog-ng@%i
+-ExecStart=/usr/sbin/syslog-ng -F $OTHER_OPTIONS --cfgfile $CONFIG_FILE --control $CONTROL_FILE --persist-file $PERSIST_FILE --pidfile $PID_FILE
++ExecStart=/sbin/syslog-ng -F $OTHER_OPTIONS --cfgfile $CONFIG_FILE --control $CONTROL_FILE --persist-file $PERSIST_FILE --pidfile $PID_FILE --worker-threads=1024 $SYSLOGNG_OPTS
  ExecReload=/bin/kill -HUP $MAINPID
- StandardOutput=null
+ StandardOutput=journal
+ StandardError=journal
+ Restart=on-failure
  
+ [Install]
++DefaultInstance=default
+-WantedBy=multi-user.target