From b1077e25a0f4c046da789f87b77ba76570131046 Mon Sep 17 00:00:00 2001
From: Matthew Fisher <matthewf@opdemand.com>
Date: Mon, 7 Apr 2014 22:03:04 -0600
Subject: [PATCH 1/2] fix(logger): change wildcard syntax

The wildcard syntax is incorrect. The proper syntax is ":omusrmsg:*". See
http://lists.adiscon.net/pipermail/rsyslog/2012-October/030846.html
---
 logger/templates/default.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/logger/templates/default.conf b/logger/templates/default.conf
index 0585650f8d..11b15b1141 100644
--- a/logger/templates/default.conf
+++ b/logger/templates/default.conf
@@ -12,4 +12,4 @@ news.err    /var/log/news/news.err
 news.notice    -/var/log/news/news.notice
 *.=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
-*.emerg    *
+*.emerg    :omusrmsg:*

From def00be88fe6da1efc47d08f146160bb18b69f2f Mon Sep 17 00:00:00 2001
From: Matthew Fisher <matthewf@opdemand.com>
Date: Mon, 7 Apr 2014 22:05:38 -0600
Subject: [PATCH 2/2] fix(logger): unload psql module

This module is currently unused in the logger.

fixes #678
---
 logger/templates/deis.conf    | 4 ----
 logger/templates/rsyslog.conf | 1 -
 2 files changed, 5 deletions(-)

diff --git a/logger/templates/deis.conf b/logger/templates/deis.conf
index 36d9d0daf8..473f8efbd4 100644
--- a/logger/templates/deis.conf
+++ b/logger/templates/deis.conf
@@ -8,7 +8,3 @@ local0.*                        -?DYNapp
 # dump logs to a remote rsyslog server
 *.*                             @@{{ .deis_logger_remoteHost }}:{{ .deis_logger_remotePort }}
 {{ end }}
-{{ if .deis_logger_dbHost }}
-# dump logs to a remote postgresql database
-*.*                             :ompgsql:{{ .deis_logger_dbHost }},{{ .deis_logger_dbUser }},{{ .deis_logger_dbName }},{{ .deis_logger_dbPassword }};
-{{ end }}
diff --git a/logger/templates/rsyslog.conf b/logger/templates/rsyslog.conf
index bad8cbe3e8..93d80ddbd3 100644
--- a/logger/templates/rsyslog.conf
+++ b/logger/templates/rsyslog.conf
@@ -12,7 +12,6 @@
 
 $ModLoad imuxsock # provides support for local system logging
 $ModLoad imklog   # provides kernel logging support (previously done by rklogd)
-$ModLoad ompgsql  # provides support for dumping logs to postgresql
 #$ModLoad immark  # provides --MARK-- message capability
 
 # provides UDP syslog reception