From fe3ac5d893d7030a3e7ce5e17ac2a64b6bc3004a Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 24 Jan 2013 10:46:52 +0100 Subject: typo fix --- doc/v7compatibility.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/v7compatibility.html b/doc/v7compatibility.html index 5b885ba9..01faacac 100644 --- a/doc/v7compatibility.html +++ b/doc/v7compatibility.html @@ -25,7 +25,7 @@ has been implemented. Consequently, situations where the previous behaviour were desired need now to be solved differently. We do not think that this will cause any problems to anyone, especially as in v6 this was announced as a missing feature. -

omusrmsr: using just a username or "*" is deprecated

+

omusrmsg: using just a username or "*" is deprecated

In legacy config format, the asterisk denotes writing the message to all users. This is usually used for emergency messages and configured like this: 

-- 
cgit v1.2.3


From 5b1d439837fb85daef2ca5c02395ec6345532479 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards 
Date: Mon, 28 Jan 2013 13:02:30 +0100
Subject: remove outdated sample rsyslog.conf

---
 Makefile.am  |  1 -
 rsyslog.conf | 60 ------------------------------------------------------------
 2 files changed, 61 deletions(-)
 delete mode 100644 rsyslog.conf

diff --git a/Makefile.am b/Makefile.am
index edeb7dea..424f9f45 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,7 +61,6 @@ EXTRA_DIST = \
 	freebsd/rsyslogd \
 	slackware/rc.rsyslogd \
 	contrib/README \
-	rsyslog.conf \
 	COPYING \
 	COPYING.LESSER \
 	COPYING.ASL20 \
diff --git a/rsyslog.conf b/rsyslog.conf
deleted file mode 100644
index 47fc4402..00000000
--- a/rsyslog.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-# if you experience problems, check
-# http://www.rsyslog.com/troubleshoot for assistance
-
-# rsyslog v3: load input modules
-# If you do not load inputs, nothing happens!
-# You may need to set the module load path if modules are not found.
-
-$ModLoad immark   # provides --MARK-- message capability
-$ModLoad imuxsock # provides support for local system logging (e.g. via logger command)
-$ModLoad imklog   # kernel logging (formerly provided by rklogd)
-
-# Log all kernel messages to the console.
-# Logging much else clutters up the screen.
-#kern.*                                                 /dev/console
-
-# Log anything (except mail) of level info or higher.
-# Don't log private authentication messages!
-*.info;mail.none;authpriv.none;cron.none                -/var/log/messages
-
-# The authpriv file has restricted access.
-authpriv.*                                              /var/log/secure
-
-# Log all the mail messages in one place.
-mail.*                                                  -/var/log/maillog
-
-
-# Log cron stuff
-cron.*                                                  -/var/log/cron
-
-# Everybody gets emergency messages
-*.emerg                                                 *
-
-# Save news errors of level crit and higher in a special file.
-uucp,news.crit                                          -/var/log/spooler
-
-# Save boot messages also to boot.log
-local7.*                                                /var/log/boot.log
-
-# Remote Logging (we use TCP for reliable delivery)
-# An on-disk queue is created for this action. If the remote host is
-# down, messages are spooled to disk and sent when it is up again.
-#$WorkDirectory /rsyslog/spool # where to place spool files
-#$ActionQueueFileName uniqName # unique name prefix for spool files
-#$ActionQueueMaxDiskSpace 1g   # 1gb space limit (use as much as possible)
-#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown
-#$ActionQueueType LinkedList   # run asynchronously
-#$ActionResumeRetryCount -1    # infinite retries if host is down
-# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional
-#*.* @@remote-host:514
-
-
-# ######### Receiving Messages from Remote Hosts ########## 
-# TCP Syslog Server:
-# provides TCP syslog reception and GSS-API (if compiled to support it)
-#$ModLoad imtcp.so  # load module
-#$InputTCPServerRun 514 # start up TCP listener at port 514
-
-# UDP Syslog Server:
-#$ModLoad imudp.so  # provides UDP syslog reception
-#$UDPServerRun 514 # start a UDP syslog server at standard port 514
-- 
cgit v1.2.3


From 53f183be990789d40bc8bf070a74932d19227103 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards 
Date: Mon, 28 Jan 2013 13:13:18 +0100
Subject: move platfrom-specific files to their own subdirectory

---
 Makefile.am                    |  6 ++-
 freebsd/rsyslogd               | 83 ----------------------------------------
 platform/README                |  4 ++
 platform/freebsd/rsyslogd      | 83 ++++++++++++++++++++++++++++++++++++++++
 platform/redhat/rsyslog.conf   | 86 ++++++++++++++++++++++++++++++++++++++++++
 platform/slackware/rc.rsyslogd | 68 +++++++++++++++++++++++++++++++++
 slackware/rc.rsyslogd          | 68 ---------------------------------
 7 files changed, 245 insertions(+), 153 deletions(-)
 delete mode 100755 freebsd/rsyslogd
 create mode 100644 platform/README
 create mode 100755 platform/freebsd/rsyslogd
 create mode 100644 platform/redhat/rsyslog.conf
 create mode 100755 platform/slackware/rc.rsyslogd
 delete mode 100755 slackware/rc.rsyslogd

diff --git a/Makefile.am b/Makefile.am
index 424f9f45..f3e9cd71 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,8 +58,10 @@ CLEANFILES = \
 endif
 
 EXTRA_DIST = \
-	freebsd/rsyslogd \
-	slackware/rc.rsyslogd \
+	platform/README \
+	platform/freebsd/rsyslogd \
+	platform/slackware/rc.rsyslogd \
+	platform/redhat/rsyslog.conf \
 	contrib/README \
 	COPYING \
 	COPYING.LESSER \
diff --git a/freebsd/rsyslogd b/freebsd/rsyslogd
deleted file mode 100755
index 1cbcb6fe..00000000
--- a/freebsd/rsyslogd
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-# Sample startup script for rsyslogd on FreeBSD.
-# It worked on my machine, but this does not necessarily
-# mean it works on all machines - it's not thouroughly
-# tested. Please note that it may also work on other
-# BSD variants, too.
-#
-# As of this writing, there was an issue with the mysql client
-# library on startup. If compiled with MySQL support, rsyslogd
-# would not necessarily start correctly but could eventually
-# die with a "mysql client libary not found" (or similar) 
-# message. I do not know its cause neither the cure. If you
-# have one, let me know.
-#
-# ATTENTION: you need also to change the /etc/rc.config file
-# and disable stock syslogd and then enable rsyslogd!
-#
-# rgerhards 2005-08-09 
-#
-
-# PROVIDE: rsyslogd
-# REQUIRE: mountcritremote cleanvar
-# BEFORE:  SERVERS
-
-. /etc/rc.subr
-
-name="rsyslogd"
-rcvar=`set_rcvar`
-pidfile="/var/run/rsyslogd.pid"
-command="/usr/sbin/${name}"
-required_files="/etc/rsyslog.conf"
-start_precmd="rsyslogd_precmd"
-extra_commands="reload"
-
-_sockfile="/var/run/rsyslogd.sockets"
-evalargs="rc_flags=\"\`set_socketlist\` \$rc_flags\""
-altlog_proglist="named"
-
-rsyslogd_precmd()
-{
-	#	Transitional symlink for old binaries
-	#
-	if [ ! -L /dev/log ]; then
-		ln -sf /var/run/log /dev/log
-	fi
-	rm -f /var/run/log
-
-	#	Create default list of syslog sockets to watch
-	#
-	( umask 022 ; > $_sockfile )
-
-	#	If running named(8) or ntpd(8) chrooted, added appropriate
-	#	syslog socket to list of sockets to watch.
-	#
-	for _l in $altlog_proglist; do
-		eval _ldir=\$${_l}_chrootdir
-		if checkyesno `set_rcvar $_l` && [ -n "$_ldir" ]; then
-			echo "${_ldir}/var/run/log" >> $_sockfile
-		fi
-	done
-
-	#	If other sockets have been provided, change run_rc_command()'s
-	#	internal copy of $rsyslogd_flags to force use of specific
-	#	rsyslogd sockets.
-	#
-	if [ -s $_sockfile ]; then
-		echo "/var/run/log" >> $_sockfile
-		eval $evalargs
-	fi
-
-	return 0
-}
-
-set_socketlist()
-{
-	_socketargs=
-	for _s in `cat $_sockfile | tr '\n' ' '` ; do
-		_socketargs="-l $_s $_socketargs"
-	done
-	echo $_socketargs
-}
-load_rc_config $name
-run_rc_command "$1"
diff --git a/platform/README b/platform/README
new file mode 100644
index 00000000..adbc3013
--- /dev/null
+++ b/platform/README
@@ -0,0 +1,4 @@
+This subdirectory contains platform-specific files. They are maintained
+based on a best effort basis, and are not necessarily the same like the
+specific platform ships them. Some files are changed in the way the
+rsyslog projects would recommend them; some may even be outdated.
diff --git a/platform/freebsd/rsyslogd b/platform/freebsd/rsyslogd
new file mode 100755
index 00000000..1cbcb6fe
--- /dev/null
+++ b/platform/freebsd/rsyslogd
@@ -0,0 +1,83 @@
+#!/bin/sh
+# Sample startup script for rsyslogd on FreeBSD.
+# It worked on my machine, but this does not necessarily
+# mean it works on all machines - it's not thouroughly
+# tested. Please note that it may also work on other
+# BSD variants, too.
+#
+# As of this writing, there was an issue with the mysql client
+# library on startup. If compiled with MySQL support, rsyslogd
+# would not necessarily start correctly but could eventually
+# die with a "mysql client libary not found" (or similar) 
+# message. I do not know its cause neither the cure. If you
+# have one, let me know.
+#
+# ATTENTION: you need also to change the /etc/rc.config file
+# and disable stock syslogd and then enable rsyslogd!
+#
+# rgerhards 2005-08-09 
+#
+
+# PROVIDE: rsyslogd
+# REQUIRE: mountcritremote cleanvar
+# BEFORE:  SERVERS
+
+. /etc/rc.subr
+
+name="rsyslogd"
+rcvar=`set_rcvar`
+pidfile="/var/run/rsyslogd.pid"
+command="/usr/sbin/${name}"
+required_files="/etc/rsyslog.conf"
+start_precmd="rsyslogd_precmd"
+extra_commands="reload"
+
+_sockfile="/var/run/rsyslogd.sockets"
+evalargs="rc_flags=\"\`set_socketlist\` \$rc_flags\""
+altlog_proglist="named"
+
+rsyslogd_precmd()
+{
+	#	Transitional symlink for old binaries
+	#
+	if [ ! -L /dev/log ]; then
+		ln -sf /var/run/log /dev/log
+	fi
+	rm -f /var/run/log
+
+	#	Create default list of syslog sockets to watch
+	#
+	( umask 022 ; > $_sockfile )
+
+	#	If running named(8) or ntpd(8) chrooted, added appropriate
+	#	syslog socket to list of sockets to watch.
+	#
+	for _l in $altlog_proglist; do
+		eval _ldir=\$${_l}_chrootdir
+		if checkyesno `set_rcvar $_l` && [ -n "$_ldir" ]; then
+			echo "${_ldir}/var/run/log" >> $_sockfile
+		fi
+	done
+
+	#	If other sockets have been provided, change run_rc_command()'s
+	#	internal copy of $rsyslogd_flags to force use of specific
+	#	rsyslogd sockets.
+	#
+	if [ -s $_sockfile ]; then
+		echo "/var/run/log" >> $_sockfile
+		eval $evalargs
+	fi
+
+	return 0
+}
+
+set_socketlist()
+{
+	_socketargs=
+	for _s in `cat $_sockfile | tr '\n' ' '` ; do
+		_socketargs="-l $_s $_socketargs"
+	done
+	echo $_socketargs
+}
+load_rc_config $name
+run_rc_command "$1"
diff --git a/platform/redhat/rsyslog.conf b/platform/redhat/rsyslog.conf
new file mode 100644
index 00000000..2210962b
--- /dev/null
+++ b/platform/redhat/rsyslog.conf
@@ -0,0 +1,86 @@
+# rsyslog configuration file (for Red Hat-based systems)
+# note that most of this config file uses old-style format,
+# because it is well-known AND quite suitable for simple cases
+# like we have with the default config. For more advanced 
+# things, RainerScript configuration is suggested.
+
+# For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html
+# If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html
+
+#### MODULES ####
+
+module(load="imuxsock") # provides support for local system logging (e.g. via logger command)
+module(load="imklog")   # provides kernel logging support (previously done by rklogd)
+#module(load"immark")  # provides --MARK-- message capability
+
+# Provides UDP syslog reception
+# for parameters see http://www.rsyslog.com/doc/imudp.html
+#module(load="imudp") # needs to be done just once
+#input(type="imudp" port="514")
+
+# Provides TCP syslog reception
+# for parameters see http://www.rsyslog.com/doc/imtcp.html
+#module(load="imtcp") # needs to be done just once
+#input(type="imtcp" port="514")
+
+
+#### GLOBAL DIRECTIVES ####
+
+# Use default timestamp format
+$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
+
+# File syncing capability is disabled by default. This feature is usually not required,
+# not useful and an extreme performance hit
+#$ActionFileEnableSync on
+
+# Include all config files in /etc/rsyslog.d/
+$IncludeConfig /etc/rsyslog.d/*.conf
+
+
+#### RULES ####
+
+# Log all kernel messages to the console.
+# Logging much else clutters up the screen.
+#kern.*                                                 /dev/console
+
+# Log anything (except mail) of level info or higher.
+# Don't log private authentication messages!
+*.info;mail.none;authpriv.none;cron.none                /var/log/messages
+
+# The authpriv file has restricted access.
+authpriv.*                                              /var/log/secure
+
+# Log all the mail messages in one place.
+mail.*                                                  /var/log/maillog
+
+
+# Log cron stuff
+cron.*                                                  /var/log/cron
+
+# Everybody gets emergency messages
+*.emerg                                                 :omusrmsg:*
+
+# Save news errors of level crit and higher in a special file.
+uucp,news.crit                                          /var/log/spooler
+
+# Save boot messages also to boot.log
+local7.*                                                /var/log/boot.log
+
+
+# ### begin forwarding rule ###
+# The statement between the begin ... end define a SINGLE forwarding
+# rule. They belong together, do NOT split them. If you create multiple
+# forwarding rules, duplicate the whole block!
+# Remote Logging (we use TCP for reliable delivery)
+#
+# An on-disk queue is created for this action. If the remote host is
+# down, messages are spooled to disk and sent when it is up again.
+#$WorkDirectory /var/lib/rsyslog # where to place spool files
+#$ActionQueueFileName fwdRule1 # unique name prefix for spool files
+#$ActionQueueMaxDiskSpace 1g   # 1gb space limit (use as much as possible)
+#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown
+#$ActionQueueType LinkedList   # run asynchronously
+#$ActionResumeRetryCount -1    # infinite retries if host is down
+# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional
+#*.* @@remote-host:514
+# ### end of the forwarding rule ###
diff --git a/platform/slackware/rc.rsyslogd b/platform/slackware/rc.rsyslogd
new file mode 100755
index 00000000..f5f8f458
--- /dev/null
+++ b/platform/slackware/rc.rsyslogd
@@ -0,0 +1,68 @@
+#!/bin/sh
+# Start/stop/restart the system logging daemons.
+#
+# Written for Slackware Linux by Patrick J. Volkerding .
+# Modded for rsyslogd by Chris Elvidge  Sept 2005
+#
+
+create_xconsole()
+{
+    if [ ! -e /dev/xconsole ]; then
+      mknod -m 640 /dev/xconsole p
+    else
+      chmod 0640 /dev/xconsole
+    fi
+    chown 0:0 /dev/xconsole
+}
+
+rsyslogd_start() {
+  if [ -x /usr/sbin/rsyslogd -a -x /usr/sbin/klogd ]; then
+    echo "Starting rsyslogd / klogd daemons:  "
+# this one listens on the "usual" socket /dev/log
+    echo "/usr/sbin/rsyslogd -i $pidfile1"
+    /usr/sbin/rsyslogd -i "$pidfile1"
+# this one listens only to the UDP port
+    sleep 1
+    echo "/usr/sbin/rsyslogd -o -r0 -f $confile2 -i $pidfile2"
+    /usr/sbin/rsyslogd -o -r0 -f "$confile2" -i "$pidfile2"
+    sleep 1 # prevent syslogd/klogd race condition on SMP kernels
+    echo "/usr/sbin/klogd -c 3 -x"
+    # '-c 3' = display level 'error' or higher messages on console
+    # '-x' = turn off broken EIP translation
+    /usr/sbin/klogd -c 3 -x
+  fi
+}
+
+rsyslogd_stop() {
+  killall rsyslogd 2> /dev/null
+  killall klogd 2> /dev/null
+  /usr/bin/rm pidfile1 2> /dev/null
+  /usr/bin/rm pidfile2 2> /dev/null
+}
+
+rsyslogd_restart() {
+  rsyslogd_stop
+  sleep 1
+  rsyslogd_start
+}
+
+confile1=/etc/rsyslog.conf
+pidfile1=/var/run/rsyslogd.pid
+
+confile2=/etc/rsyslog.udp.conf
+pidfile2=/var/run/rsyslogd.udp.pid
+
+case "$1" in
+'start')
+  create_xconsole
+  rsyslogd_start
+  ;;
+'stop')
+  rsyslogd_stop
+  ;;
+'restart')
+  rsyslogd_restart
+  ;;
+*)
+  echo "usage $0 start|stop|restart"
+esac
diff --git a/slackware/rc.rsyslogd b/slackware/rc.rsyslogd
deleted file mode 100755
index f5f8f458..00000000
--- a/slackware/rc.rsyslogd
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-# Start/stop/restart the system logging daemons.
-#
-# Written for Slackware Linux by Patrick J. Volkerding .
-# Modded for rsyslogd by Chris Elvidge  Sept 2005
-#
-
-create_xconsole()
-{
-    if [ ! -e /dev/xconsole ]; then
-      mknod -m 640 /dev/xconsole p
-    else
-      chmod 0640 /dev/xconsole
-    fi
-    chown 0:0 /dev/xconsole
-}
-
-rsyslogd_start() {
-  if [ -x /usr/sbin/rsyslogd -a -x /usr/sbin/klogd ]; then
-    echo "Starting rsyslogd / klogd daemons:  "
-# this one listens on the "usual" socket /dev/log
-    echo "/usr/sbin/rsyslogd -i $pidfile1"
-    /usr/sbin/rsyslogd -i "$pidfile1"
-# this one listens only to the UDP port
-    sleep 1
-    echo "/usr/sbin/rsyslogd -o -r0 -f $confile2 -i $pidfile2"
-    /usr/sbin/rsyslogd -o -r0 -f "$confile2" -i "$pidfile2"
-    sleep 1 # prevent syslogd/klogd race condition on SMP kernels
-    echo "/usr/sbin/klogd -c 3 -x"
-    # '-c 3' = display level 'error' or higher messages on console
-    # '-x' = turn off broken EIP translation
-    /usr/sbin/klogd -c 3 -x
-  fi
-}
-
-rsyslogd_stop() {
-  killall rsyslogd 2> /dev/null
-  killall klogd 2> /dev/null
-  /usr/bin/rm pidfile1 2> /dev/null
-  /usr/bin/rm pidfile2 2> /dev/null
-}
-
-rsyslogd_restart() {
-  rsyslogd_stop
-  sleep 1
-  rsyslogd_start
-}
-
-confile1=/etc/rsyslog.conf
-pidfile1=/var/run/rsyslogd.pid
-
-confile2=/etc/rsyslog.udp.conf
-pidfile2=/var/run/rsyslogd.udp.pid
-
-case "$1" in
-'start')
-  create_xconsole
-  rsyslogd_start
-  ;;
-'stop')
-  rsyslogd_stop
-  ;;
-'restart')
-  rsyslogd_restart
-  ;;
-*)
-  echo "usage $0 start|stop|restart"
-esac
-- 
cgit v1.2.3