From 5acda3eaeabae9045609539303a8c12c4ce401f1 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 25 Apr 2016 12:01:08 +0200 Subject: merge with latest dev version --- core/modules/rsyslogd/data/etc/rsyslog.conf | 84 +++++++++++++++++++++++++ core/modules/rsyslogd/module.build | 34 ++++++++++ core/modules/rsyslogd/module.conf | 9 +++ core/modules/rsyslogd/module.conf.centos | 3 + core/modules/rsyslogd/module.conf.debian | 3 + core/modules/rsyslogd/module.conf.fedora | 3 + core/modules/rsyslogd/module.conf.opensuse | 6 ++ core/modules/rsyslogd/module.conf.opensuse.13.2 | 9 +++ core/modules/rsyslogd/module.conf.ubuntu | 4 ++ 9 files changed, 155 insertions(+) create mode 100644 core/modules/rsyslogd/data/etc/rsyslog.conf create mode 100644 core/modules/rsyslogd/module.build create mode 100644 core/modules/rsyslogd/module.conf create mode 100644 core/modules/rsyslogd/module.conf.centos create mode 100644 core/modules/rsyslogd/module.conf.debian create mode 100644 core/modules/rsyslogd/module.conf.fedora create mode 100644 core/modules/rsyslogd/module.conf.opensuse create mode 100644 core/modules/rsyslogd/module.conf.opensuse.13.2 create mode 100644 core/modules/rsyslogd/module.conf.ubuntu (limited to 'core/modules/rsyslogd') diff --git a/core/modules/rsyslogd/data/etc/rsyslog.conf b/core/modules/rsyslogd/data/etc/rsyslog.conf new file mode 100644 index 00000000..65b4db88 --- /dev/null +++ b/core/modules/rsyslogd/data/etc/rsyslog.conf @@ -0,0 +1,84 @@ +# /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 * +# +# 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 new file mode 100644 index 00000000..c35d07b7 --- /dev/null +++ b/core/modules/rsyslogd/module.build @@ -0,0 +1,34 @@ +fetch_source() { + : +} + +build() { + COPYLIST="list_dpkg_output" + [ -e "$COPYLIST" ] && rm "$COPYLIST" + + list_packet_files >> "$COPYLIST" + tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}" + + return 0 +} + +post_copy() { + + + # 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 new file mode 100644 index 00000000..207f0a1d --- /dev/null +++ b/core/modules/rsyslogd/module.conf @@ -0,0 +1,9 @@ +REQUIRED_BINARIES=" + rsyslogd +" +REQUIRED_FILES=" + /etc/rsyslog.conf +" +REQUIRED_DIRECTORIES=" + /usr/$LIB64/rsyslog +" diff --git a/core/modules/rsyslogd/module.conf.centos b/core/modules/rsyslogd/module.conf.centos new file mode 100644 index 00000000..6f3cb891 --- /dev/null +++ b/core/modules/rsyslogd/module.conf.centos @@ -0,0 +1,3 @@ +REQUIRED_CONTENT_PACKAGES=" + rsyslog +" diff --git a/core/modules/rsyslogd/module.conf.debian b/core/modules/rsyslogd/module.conf.debian new file mode 100644 index 00000000..6f3cb891 --- /dev/null +++ b/core/modules/rsyslogd/module.conf.debian @@ -0,0 +1,3 @@ +REQUIRED_CONTENT_PACKAGES=" + rsyslog +" diff --git a/core/modules/rsyslogd/module.conf.fedora b/core/modules/rsyslogd/module.conf.fedora new file mode 100644 index 00000000..6f3cb891 --- /dev/null +++ b/core/modules/rsyslogd/module.conf.fedora @@ -0,0 +1,3 @@ +REQUIRED_CONTENT_PACKAGES=" + rsyslog +" diff --git a/core/modules/rsyslogd/module.conf.opensuse b/core/modules/rsyslogd/module.conf.opensuse new file mode 100644 index 00000000..6d7a3c99 --- /dev/null +++ b/core/modules/rsyslogd/module.conf.opensuse @@ -0,0 +1,6 @@ +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 new file mode 100644 index 00000000..b1d7fd03 --- /dev/null +++ b/core/modules/rsyslogd/module.conf.opensuse.13.2 @@ -0,0 +1,9 @@ +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 new file mode 100644 index 00000000..ac8df362 --- /dev/null +++ b/core/modules/rsyslogd/module.conf.ubuntu @@ -0,0 +1,4 @@ +REQUIRED_CONTENT_PACKAGES=" + rsyslog +" + -- cgit v1.2.3-55-g7522