From 3ef54ff90b2639c4b5ae6b2b75436dc8c909d4de Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Wed, 19 Apr 2017 14:25:44 -0400
Subject: [PATCH] Disable xconsole for rsyslog on ubuntu

Until fixed properly upstream, we need to ship our own 50-default.conf
file.

  https://bugs.launchpad.net/ubuntu/+source/rsyslog/+bug/459730

Change-Id: I3eaf646e4d22ae0bcdecbf8b675930ae5587496b
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 .../infra-package-needs/install.d/89-rsyslog  | 26 +++++++
 .../rsyslog.d/50-default.conf                 | 68 +++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100755 nodepool/elements/infra-package-needs/install.d/89-rsyslog
 create mode 100644 nodepool/elements/infra-package-needs/rsyslog.d/50-default.conf

diff --git a/nodepool/elements/infra-package-needs/install.d/89-rsyslog b/nodepool/elements/infra-package-needs/install.d/89-rsyslog
new file mode 100755
index 0000000000..fe3b0d6f5f
--- /dev/null
+++ b/nodepool/elements/infra-package-needs/install.d/89-rsyslog
@@ -0,0 +1,26 @@
+#!/bin/bash
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# dib-lint: disable=setu setpipefail
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
+set -e
+
+if [ "$DISTRO_NAME" == "ubuntu" ]; then
+    rsyslog_dir="$(dirname $0)/../rsyslog.d"
+    cp -RP $rsyslog_dir/* /etc/rsyslog.d/
+fi
diff --git a/nodepool/elements/infra-package-needs/rsyslog.d/50-default.conf b/nodepool/elements/infra-package-needs/rsyslog.d/50-default.conf
new file mode 100644
index 0000000000..528af29d23
--- /dev/null
+++ b/nodepool/elements/infra-package-needs/rsyslog.d/50-default.conf
@@ -0,0 +1,68 @@
+#  Default rules for rsyslog.
+#
+#			For more information see rsyslog.conf(5) and /etc/rsyslog.conf
+
+#
+# First some standard log files.  Log by facility.
+#
+auth,authpriv.*			/var/log/auth.log
+*.*;auth,authpriv.none		-/var/log/syslog
+#cron.*				/var/log/cron.log
+#daemon.*			-/var/log/daemon.log
+kern.*				-/var/log/kern.log
+#lpr.*				-/var/log/lpr.log
+mail.*				-/var/log/mail.log
+#user.*				-/var/log/user.log
+
+#
+# Logging for the mail system.  Split it up so that
+# it is easy to write scripts to parse these files.
+#
+#mail.info			-/var/log/mail.info
+#mail.warn			-/var/log/mail.warn
+mail.err			/var/log/mail.err
+
+#
+# Logging for INN news system.
+#
+news.crit			/var/log/news/news.crit
+news.err			/var/log/news/news.err
+news.notice			-/var/log/news/news.notice
+
+#
+# Some "catch-all" log files.
+#
+#*.=debug;\
+#	auth,authpriv.none;\
+#	news.none;mail.none	-/var/log/debug
+#*.=info;*.=notice;*.=warn;\
+#	auth,authpriv.none;\
+#	cron,daemon.none;\
+#	mail,news.none		-/var/log/messages
+
+#
+# Emergencies are sent to everybody logged in.
+#
+*.emerg                                :omusrmsg:*
+
+#
+# I like to have messages displayed on the console, but only on a virtual
+# console I usually leave idle.
+#
+#daemon,mail.*;\
+#	news.=crit;news.=err;news.=notice;\
+#	*.=debug;*.=info;\
+#	*.=notice;*.=warn	/dev/tty8
+
+# The named pipe /dev/xconsole is for the `xconsole' utility.  To use it,
+# you must invoke `xconsole' with the `-file' option:
+#
+#    $ xconsole -file /dev/xconsole [...]
+#
+# NOTE: adjust the list below, or you'll go crazy if you have a reasonably
+#      busy site..
+#
+#daemon.*;mail.*;\
+#	news.err;\
+#	*.=debug;*.=info;\
+#	*.=notice;*.=warn	|/dev/xconsole