Re-enable journal forwarding to syslog

Revert upstream commit 46b131574fdd7d77 for now, until Debian's sysloggers
can/do all read from the journal directly. See

  http://lists.freedesktop.org/archives/systemd-devel/2014-November/025550.html

for details. Once we grow a journal.conf.d/ directory, sysloggers can be moved
to pulling from the journal one by one and disable forwarding again in such a
conf.d snippet.

Gbp-Pq: Topic debian
Gbp-Pq: Name Re-enable-journal-forwarding-to-syslog.patch

diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 2791678a4f97128d845dc6ae3d0cb5909c31c862..3a9e20a38984547496d9bc0579f08a876c39af4c 100644 (file)
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -296,7 +296,7 @@
         the system console, or sent as wall messages to all logged-in users.  These
         options take boolean arguments. If forwarding to syslog is enabled but nothing
         reads messages from the socket, forwarding to syslog has no effect. By default,
-        only forwarding to wall is enabled. These settings may be overridden at boot time
+        only forwarding to syslog and wall is enabled. These settings may be overridden at boot time
         with the kernel command line options
         <literal>systemd.journald.forward_to_syslog</literal>,
         <literal>systemd.journald.forward_to_kmsg</literal>,

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 2a960ebb3e7b147a5f5eb337c2b38c711dee5394..7fe0f824103309a4751d49de7874a7eba71b4fbf 100644 (file)
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1835,6 +1835,7 @@ int server_init(Server *s) {
         s->rate_limit_interval = DEFAULT_RATE_LIMIT_INTERVAL;
         s->rate_limit_burst = DEFAULT_RATE_LIMIT_BURST;
 
+        s->forward_to_syslog = true;
         s->forward_to_wall = true;
 
         s->max_file_usec = DEFAULT_MAX_FILE_USEC;

diff --git a/src/journal/journald.conf b/src/journal/journald.conf
index 2f1c661153980dda8cf5bac2ef30b0150d18cf03..8951d9e60a7d907658acbc42bc5cdd2d31051f21 100644 (file)
--- a/src/journal/journald.conf
+++ b/src/journal/journald.conf
@@ -29,7 +29,7 @@
 #RuntimeMaxFiles=100
 #MaxRetentionSec=
 #MaxFileSec=1month
-#ForwardToSyslog=no
+#ForwardToSyslog=yes
 #ForwardToKMsg=no
 #ForwardToConsole=no
 #ForwardToWall=yes