summaryrefslogtreecommitdiff
path: root/sysconf
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-10-08 17:11:30 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-10-08 17:11:30 -0700
commit8c76eecf50f943b0a7e759f398f6d16dac53dac0 (patch)
treefd3994149511fed21d09d2ff5ec2b3339535e5f1 /sysconf
parentcbc9578ade6afaf6db039401182b6cfe14e73ff9 (diff)
downloadvyatta-cfg-system-8c76eecf50f943b0a7e759f398f6d16dac53dac0.tar.gz
vyatta-cfg-system-8c76eecf50f943b0a7e759f398f6d16dac53dac0.zip
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
Diffstat (limited to 'sysconf')
-rw-r--r--sysconf/rsyslog.conf46
-rw-r--r--sysconf/syslog.conf12
2 files changed, 46 insertions, 12 deletions
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