Merge def00be into 6617b70

deis · Apr 8, 2014 · c6f9dac · c6f9dac
2 parents 6617b70 + def00be
commit c6f9dac
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git 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:*
diff --git 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
@@ -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