From 8c76eecf50f943b0a7e759f398f6d16dac53dac0 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri, 8 Oct 2010 17:11:30 -0700
Subject: Convert from syslog to rsyslog

Configuration file is /etc/rsyslog.conf and it is supports
directory of include parameters so do not need to edit
rsyslog.conf directly
---
 sysconf/rsyslog.conf | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 sysconf/syslog.conf  | 12 ------------
 2 files changed, 46 insertions(+), 12 deletions(-)
 create mode 100644 sysconf/rsyslog.conf
 delete mode 100644 sysconf/syslog.conf

(limited to 'sysconf')

diff --git a/sysconf/rsyslog.conf b/sysconf/rsyslog.conf
new file mode 100644
index 00000000..9d767d90
--- /dev/null
+++ b/sysconf/rsyslog.conf
@@ -0,0 +1,46 @@
+#  /etc/rsyslog.conf	Configuration file for rsyslog.
+#
+#			For more information see
+#			/usr/share/doc/rsyslog-doc/html/rsyslog_conf.html
+
+
+#################
+#### MODULES ####
+#################
+
+$ModLoad imuxsock # provides support for local system logging
+$ModLoad imklog   # provides kernel logging support (previously done by rklogd)
+#$ModLoad immark  # provides --MARK-- message capability
+
+# provides UDP syslog reception
+#$ModLoad imudp
+#$UDPServerRun 514
+
+# provides TCP syslog reception
+#$ModLoad imtcp
+#$InputTCPServerRun 514
+
+
+###########################
+#### GLOBAL DIRECTIVES ####
+###########################
+
+#
+# Use traditional timestamp format.
+# To enable high precision timestamps, comment out the following line.
+#
+$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
+
+#
+# Set the default permissions for all log files.
+#
+$FileOwner root
+$FileGroup adm
+$FileCreateMode 0640
+$DirCreateMode 0755
+$Umask 0022
+
+#
+# Include all config files in /etc/rsyslog.d/
+#
+$IncludeConfig /etc/rsyslog.d/*.conf
diff --git a/sysconf/syslog.conf b/sysconf/syslog.conf
deleted file mode 100644
index 2f443198..00000000
--- a/sysconf/syslog.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-#  /etc/syslog.conf	Configuration file for syslogd.
-#
-#			For more information see syslog.conf(5)
-#			manpage.
-#
-# WARNING
-
-# The following are modified Vyatta Fusion CLI related configuration
-# any changes outside CLI will be lost
-### BEGIN VYATTA
-*.notice;local7.*		-/var/log/messages
-### END VYATTA
-- 
cgit v1.2.3