main/syslog-ng: replace weirdly modularized configs with single file

Building syslog-ng configuration from multiple fragment files using
a shell script is unnecessary complicated and error prone - syslog-ng
supports the include directive.

This change is not backward compatible, but I quite doubt that anyone
was using this.

The new config is based on the default config for RedHat from upstream.

1 files changed, 0 insertions, 43 deletions

diff --git a/main/syslog-ng/syslog-ng.initd b/main/syslog-ng/syslog-ng.initd
index 894081fbfa8..38144142f85 100755
--- a/main/syslog-ng/syslog-ng.initd
+++ b/main/syslog-ng/syslog-ng.initd
@@ -11,10 +11,6 @@ depend() {
 	provide logger
 }
 
-start_pre() {
-	update
-}
-
 start() {
 	ebegin "Starting syslog-ng"
 	start-stop-daemon --start --quiet --pidfile /run/syslog-ng.pid --exec /usr/sbin/syslog-ng -- --process-mode background
@@ -37,42 +33,3 @@ reload() {
 	start-stop-daemon --signal HUP --pidfile /run/syslog-ng.pid --exec /usr/sbin/syslog-ng
 	eend $?
 }
-
-grep_syslog_conf_entries() {
-	local section="$1" FN filelist
-	grep -v '^#' /etc/syslog-ng/syslog-ng-${section}.std
-	filelist=$(find /etc/syslog-ng/ -maxdepth 1 -type f -name "syslog-ng-${section}.*" | grep -Ev ".backup|.std|~")
-	if [ $? -eq 0 ]
-	then
-		for FN in ${filelist}
-		do
-			grep -v '^#' $FN
-		done
-	fi
-}
-
-update() {
-	local fname='/etc/syslog-ng/syslog-ng.conf'
-	local f_tmp="/etc/syslog-ng/syslog-ng.conf.$$"
-	for ng_std in options source destination filter log
-	do
-		[ -f /etc/syslog-ng/syslog-ng-${ng_std}.std ] || exit 1
-	done
-	{
-		# create options entries
-		grep_syslog_conf_entries plugins
-		echo "options {"
-		grep_syslog_conf_entries options
-		echo "};"
-		# create source entries
-		grep_syslog_conf_entries source
-		# create destination entries
-		grep_syslog_conf_entries destination
-		# create filter entries
-		grep_syslog_conf_entries filter
-		# create log entries
-		grep_syslog_conf_entries log
-	} > $f_tmp
-	cp -p $f_tmp $fname
-	rm -f $f_tmp
-}