- reverted config merge, updated to 3.14

diff --git a/syslog-ng-simple.conf b/syslog-ng-simple.conf
index 48ba9211faa0bab39efc99cf41eb74e86fb6df07..4bd888c90f9fed5361c80db835f0659f4c224296 100644 (file)
--- a/syslog-ng-simple.conf
+++ b/syslog-ng-simple.conf
@@ -1,6 +1,6 @@
-@version: 3.8
+@version: 3.14
 #
-# Syslog-ng configuration for PLD Linux
+# Syslog-ng configuration for TLD Linux
 #
 # See syslog-ng(8) and syslog-ng.conf(5) for more information.
 #
@@ -25,11 +25,6 @@ source s_sys {
        file ("/proc/kmsg" program_override("kernel"));
 
        unix-stream("/dev/log" max-connections(1000) log_iw_size(100000));
-# if using systemd, comment out the line above, and uncomment line below
-#      unix-dgram("/run/systemd/journal/syslog");
-# NOTE: if you are running under systemd and fixed config then you may need to manually fix /dev/log symlink:
-# ln -s /run/systemd/journal/dev-log /dev/log
-#
        internal();
 };
 

diff --git a/syslog-ng.conf b/syslog-ng.conf
index 1b5843a110ad21f667ca8349d98d41a112141dcf..ccdee9b413b8d1a6fd2fb1bf6918044de53adccc 100644 (file)
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -1,7 +1,7 @@
-@version: 3.12
+@version: 3.14
 @include "scl.conf"
 #
-# Syslog-ng configuration for PLD Linux
+# Syslog-ng configuration for TLD Linux
 #
 # See syslog-ng(8) and syslog-ng.conf(5) for more information.
 #
@@ -23,10 +23,6 @@ options {
 };
 
 source s_sys {
-# NOTE:
-#   if you are running under systemd and just merged config then you may
-#   need to manually fix /dev/log symlink:
-# # ln -s /run/systemd/journal/dev-log /dev/log
        system();
        internal();
 };
@@ -34,7 +30,6 @@ source s_sys {
 # uncomment the line below if you want to setup syslog server
 #source s_net  { udp(); };
 
-# if using systemd, an IP address instead of name may be required here
 #destination d_loghost { udp("loghost" port(514)); };
 
 destination d_kern     { file("/var/log/kernel"); };

diff --git a/syslog-ng.spec b/syslog-ng.spec
index c509142c599e0cb48fb028ac0e50da64e1b81bb5..3a856050890917e05a765513aaea8eddde0cca0c 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -37,7 +37,7 @@ Summary(pl.UTF-8):    Syslog-ng - systemowy demon logujący nowej generacji
 Summary(pt_BR.UTF-8):  Daemon de log nova geração
 Name:          syslog-ng
 Version:       3.14.1
-Release:       2
+Release:       3
 License:       GPL v2+ with OpenSSL exception
 Group:         Daemons
 Source0:       https://github.com/balabit/syslog-ng/archive/%{name}-%{version}.tar.gz