[rsyslogd] Kill it with fire

11 files changed, 0 insertions, 161 deletions

diff --git a/core/modules/rsyslogd/data/etc/rsyslog.conf b/core/modules/rsyslogd/data/etc/rsyslog.conf
deleted file mode 100644
index 1d7ae3dc..00000000
--- a/core/modules/rsyslogd/data/etc/rsyslog.conf
+++ /dev/null
@@ -1,84 +0,0 @@
-#  /etc/rsyslog.conf    Configuration file for rsyslogd.
-#
-#                       For more information see
-#                       /usr/share/doc/rsyslog/html/rsyslog_conf.html
-#
-# First some standard logfiles.  Log by facility.
-#
-
-$ModLoad imuxsock # provides support for local system logging
-$ModLoad imklog   # provides kernel logging support (previously done by rklogd)
-$ModLoad immark
-$MarkMessagePeriod      3600
-$RepeatedMsgReduction   on
-
-
-if      ( \
-            /* kernel up to warning except of firewall  */ \
-            ($syslogfacility-text == 'kern')      and      \
-            ($syslogseverity <= 4 /* warning */ ) and not  \
-            ($msg contains 'IN=' and $msg contains 'OUT=') \
-        ) or ( \
-            /* up to errors except of facility authpriv */ \
-            ($syslogseverity <= 3 /* errors  */ ) and not  \
-            ($syslogfacility-text == 'authpriv')           \
-        ) \
-then    /dev/tty10
-
-
-
-auth,authpriv.*                 /var/log/auth.log
-*.*;auth,authpriv.none          -/var/log/syslog
-#cron.*                         /var/log/cron.log
-daemon.*                        -/var/log/daemon.log
-kern.*                          -/var/log/kern.log
-lpr.*                           -/var/log/lpr.log
-mail.*                          -/var/log/mail.log
-user.*                          -/var/log/user.log
-#
-# Logging for the mail system.  Split it up so that
-# it is easy to write scripts to parse these files.
-#
-mail.info                       -/var/log/mail.info
-mail.warn                       -/var/log/mail.warn
-mail.err                        /var/log/mail.err
-#
-# Logging for INN news system
-#
-news.crit                       /var/log/news/news.crit
-news.err                        /var/log/news/news.err
-news.notice                     -/var/log/news/news.notice
-#
-# Some `catch-all' logfiles.
-#
-*.=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
-#
-# Emergencies are sent to everybody logged in.
-#
-*.emerg                         :omusrmsg:*
-#
-# I like to have messages displayed on the console, but only on a virtual
-# console I usually leave idle.
-#
-#daemon,mail.*;\
-#       news.=crit;news.=err;news.=notice;\
-#       *.=debug;*.=info;\
-#       *.=notice;*.=warn       /dev/tty8
-# The named pipe /dev/xconsole is for the `xconsole' utility.  To use it,
-# you must invoke `xconsole' with the `-file' option:
-#
-#    $ xconsole -file /dev/xconsole [...]
-#
-# NOTE: adjust the list below, or you'll go crazy if you have a reasonably
-#      busy site..
-#
-daemon.*;mail.*;\
-        news.err;\
-        *.=debug;*.=info;\
-        *.=notice;*.=warn	|/dev/tty11
diff --git a/core/modules/rsyslogd/module.build b/core/modules/rsyslogd/module.build
deleted file mode 100644
index 887a9776..00000000
--- a/core/modules/rsyslogd/module.build
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-fetch_source() {
-	:
-}
-
-build() {
-	:
-}
-
-post_copy() {
-	# TODO This is garbage: Assumes we use our own systemd, hard-coded path
-	# Fix this or get rid of rsyslogd
-	# pwd = module's build dir
-	mkdir -p "${TARGET_BUILD_DIR}/var/spool/rsyslog"
-
-	local RSL="$(find /usr/lib/ /lib/ -name rsyslog.service | head -1)"
-	[ -z "$RSL" -o ! -e "$RSL" ] && perror "rsyslog.service not found on vorlage"
-	[ ! -d "$TARGET_BUILD_DIR/etc/systemd/system" ] && mkdir -p "$TARGET_BUILD_DIR/etc/systemd/system"
-	cp -L "$RSL" "$TARGET_BUILD_DIR/etc/systemd/system/"
-	sed -i 's/\/bin\/systemctl/-\/usr\/bin\/systemctl/g' "${TARGET_BUILD_DIR}"/etc/systemd/system/rsyslog.service
-	sed -i 's/^Before=udev/#&/' "${TARGET_BUILD_DIR}"/etc/systemd/system/rsyslog.service
-	
-	# activate the service
-	ln -sf rsyslog.service "${TARGET_BUILD_DIR}"/etc/systemd/system/syslog.service
-	[ ! -d "${TARGET_BUILD_DIR}"/etc/systemd/system/basic.target.wants ] && mkdir -p "${TARGET_BUILD_DIR}"/etc/systemd/system/basic.target.wants
-	ln -sf ../syslog.service "${TARGET_BUILD_DIR}"/etc/systemd/system/basic.target.wants/syslog.service
-	# TODO: more checks
-	sed -i.bak '/^After\=var-run.mount/d;/^Requires\=var-run.mount/d;/^Before\=syslog.target/d' "$TARGET_BUILD_DIR/etc/systemd/system/rsyslog.service"
-}
diff --git a/core/modules/rsyslogd/module.conf b/core/modules/rsyslogd/module.conf
deleted file mode 100644
index 2718f02b..00000000
--- a/core/modules/rsyslogd/module.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-REQUIRED_BINARIES="	
-			rsyslogd
-"
-REQUIRED_FILES="	
-			/etc/rsyslog.conf
-"
-REQUIRED_DIRECTORIES="
-			/usr/$LIB64/rsyslog
-			/usr/lib/x86_64-linux-gnu/rsyslog
-"
diff --git a/core/modules/rsyslogd/module.conf.centos b/core/modules/rsyslogd/module.conf.centos
deleted file mode 100644
index 0063adbf..00000000
--- a/core/modules/rsyslogd/module.conf.centos
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-REQUIRED_CONTENT_PACKAGES="	
-			rsyslog
-"
diff --git a/core/modules/rsyslogd/module.conf.debian b/core/modules/rsyslogd/module.conf.debian
deleted file mode 100644
index e897dee2..00000000
--- a/core/modules/rsyslogd/module.conf.debian
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-REQUIRED_CONTENT_PACKAGES="	
-			rsyslog
-"
-
diff --git a/core/modules/rsyslogd/module.conf.fedora b/core/modules/rsyslogd/module.conf.fedora
deleted file mode 100644
index 0063adbf..00000000
--- a/core/modules/rsyslogd/module.conf.fedora
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-REQUIRED_CONTENT_PACKAGES="	
-			rsyslog
-"
diff --git a/core/modules/rsyslogd/module.conf.opensuse b/core/modules/rsyslogd/module.conf.opensuse
deleted file mode 100644
index 773da57b..00000000
--- a/core/modules/rsyslogd/module.conf.opensuse
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-REQUIRED_CONTENT_PACKAGES="	
-			rsyslog
-"
-REQUIRED_BINARIES+="
-			rsyslog-service-prepare
-"
diff --git a/core/modules/rsyslogd/module.conf.opensuse.13.2 b/core/modules/rsyslogd/module.conf.opensuse.13.2
deleted file mode 100644
index cb4570d9..00000000
--- a/core/modules/rsyslogd/module.conf.opensuse.13.2
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-REQUIRED_CONTENT_PACKAGES="
-			rsyslog
-"
-REQUIRED_INSTALLED_PACKAGES="
-			rsyslog
-"
-REQUIRED_BINARIES+="
-			rsyslog-service-prepare
-"
diff --git a/core/modules/rsyslogd/module.conf.ubuntu b/core/modules/rsyslogd/module.conf.ubuntu
deleted file mode 100644
index e897dee2..00000000
--- a/core/modules/rsyslogd/module.conf.ubuntu
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-REQUIRED_CONTENT_PACKAGES="	
-			rsyslog
-"
-
diff --git a/core/targets/stage32-headless/rsyslogd b/core/targets/stage32-headless/rsyslogd
deleted file mode 120000
index 339d02f8..00000000
--- a/core/targets/stage32-headless/rsyslogd
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/rsyslogd
\ No newline at end of file
diff --git a/core/targets/stage32/rsyslogd b/core/targets/stage32/rsyslogd
deleted file mode 120000
index 339d02f8..00000000
--- a/core/targets/stage32/rsyslogd
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/rsyslogd
\ No newline at end of file