summaryrefslogtreecommitdiffstats
path: root/remote/modules/rsyslogd
diff options
context:
space:
mode:
authorSimon Rettberg2013-04-24 20:11:51 +0200
committerSimon Rettberg2013-04-24 20:11:51 +0200
commit3ea8042163cdd191db1237ede4cbb06f497c9fdc (patch)
tree71293396ef12f3fd2ddd4cf57335f710498c4fda /remote/modules/rsyslogd
parentseveral suse fixes (login etc) (diff)
parentfix rsyslogd for ubuntu (hopefully not broken on suse :/) (diff)
downloadtm-scripts-3ea8042163cdd191db1237ede4cbb06f497c9fdc.tar.gz
tm-scripts-3ea8042163cdd191db1237ede4cbb06f497c9fdc.tar.xz
tm-scripts-3ea8042163cdd191db1237ede4cbb06f497c9fdc.zip
Super duper merge
Diffstat (limited to 'remote/modules/rsyslogd')
-rw-r--r--remote/modules/rsyslogd/rsyslogd.build2
-rw-r--r--remote/modules/rsyslogd/rsyslogd.conf7
2 files changed, 6 insertions, 3 deletions
diff --git a/remote/modules/rsyslogd/rsyslogd.build b/remote/modules/rsyslogd/rsyslogd.build
index cee5c7ed..c46adb0d 100644
--- a/remote/modules/rsyslogd/rsyslogd.build
+++ b/remote/modules/rsyslogd/rsyslogd.build
@@ -13,6 +13,8 @@ build() {
}
post_copy() {
+
+
# pwd = module's build dir
mkdir -p "${TARGET_BUILD_DIR}"/var/spool/rsyslog
diff --git a/remote/modules/rsyslogd/rsyslogd.conf b/remote/modules/rsyslogd/rsyslogd.conf
index 20b5df1b..f027d6e0 100644
--- a/remote/modules/rsyslogd/rsyslogd.conf
+++ b/remote/modules/rsyslogd/rsyslogd.conf
@@ -1,4 +1,5 @@
+REQUIRED_PACKAGES=" rsyslog"
REQUIRED_BINARIES=" rsyslogd"
-REQUIRED_FILES=" /etc/rsyslog.conf"
-REQUIRED_DIRECTORIES=" /etc/rsyslog.d
- /usr/lib/rsyslog"
+REQUIRED_DIRECTORIES=" /usr/lib/rsyslog"
+REQUIRED_SYSTEM_FILES=" /etc/rsyslog.conf
+ /etc/rsyslog.d/50-default.conf"