diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2020-04-14 18:29:01 +0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2020-05-15 05:30:57 -0700 |
commit | b7db91fd19ebe63504c21fb4b8229fda42d88fc0 (patch) | |
tree | 769cdc77eec791ff931c93e46363e41843baa86a | |
parent | 4e1535874ea585659637adae9254634af770cd71 (diff) | |
download | meta-security-b7db91fd19ebe63504c21fb4b8229fda42d88fc0.tar.gz |
samhain-server: add volatile file for systemd
Add volatile file to create /var/log/yule when using systemd. Also
remove unused /var/log directory in do_install.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | recipes-ids/samhain/files/samhain-server-volatiles.conf | 1 | ||||
-rw-r--r-- | recipes-ids/samhain/samhain-server.bb | 16 | ||||
-rw-r--r-- | recipes-ids/samhain/samhain.inc | 2 |
3 files changed, 15 insertions, 4 deletions
diff --git a/recipes-ids/samhain/files/samhain-server-volatiles.conf b/recipes-ids/samhain/files/samhain-server-volatiles.conf new file mode 100644 index 0000000..f2ea390 --- /dev/null +++ b/recipes-ids/samhain/files/samhain-server-volatiles.conf | |||
@@ -0,0 +1 @@ | |||
d /var/log/yule 0775 daemon daemon - | |||
diff --git a/recipes-ids/samhain/samhain-server.bb b/recipes-ids/samhain/samhain-server.bb index d304912..e7a3aa6 100644 --- a/recipes-ids/samhain/samhain-server.bb +++ b/recipes-ids/samhain/samhain-server.bb | |||
@@ -4,14 +4,22 @@ require samhain.inc | |||
4 | 4 | ||
5 | DEPENDS = "gmp" | 5 | DEPENDS = "gmp" |
6 | 6 | ||
7 | SRC_URI += "file://samhain-server-volatiles" | 7 | SRC_URI += "file://samhain-server-volatiles \ |
8 | file://samhain-server-volatiles.conf \ | ||
9 | " | ||
8 | 10 | ||
9 | TARGET_CC_ARCH += "${LDFLAGS}" | 11 | TARGET_CC_ARCH += "${LDFLAGS}" |
10 | 12 | ||
11 | do_install_append() { | 13 | do_install_append() { |
12 | install -d ${D}${sysconfdir}/default/volatiles | 14 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
13 | install -m 0644 ${WORKDIR}/samhain-server-volatiles \ | 15 | install -d ${D}${sysconfdir}/tmpfiles.d |
14 | ${D}${sysconfdir}/default/volatiles/samhain-server | 16 | install -m 0644 ${WORKDIR}/samhain-server-volatiles.conf \ |
17 | ${D}${sysconfdir}/tmpfiles.d/samhain-server.conf | ||
18 | else | ||
19 | install -d ${D}${sysconfdir}/default/volatiles | ||
20 | install -m 0644 ${WORKDIR}/samhain-server-volatiles \ | ||
21 | ${D}${sysconfdir}/default/volatiles/samhain-server | ||
22 | fi | ||
15 | 23 | ||
16 | install -m 700 samhain-install.sh init/samhain.startLinux \ | 24 | install -m 700 samhain-install.sh init/samhain.startLinux \ |
17 | init/samhain.startLSB ${D}/var/lib/samhain | 25 | init/samhain.startLSB ${D}/var/lib/samhain |
diff --git a/recipes-ids/samhain/samhain.inc b/recipes-ids/samhain/samhain.inc index 91eb697..0a5e432 100644 --- a/recipes-ids/samhain/samhain.inc +++ b/recipes-ids/samhain/samhain.inc | |||
@@ -159,6 +159,8 @@ do_install_append () { | |||
159 | if [ -d ${D}${localstatedir}/run ]; then | 159 | if [ -d ${D}${localstatedir}/run ]; then |
160 | rmdir ${D}${localstatedir}/run | 160 | rmdir ${D}${localstatedir}/run |
161 | fi | 161 | fi |
162 | |||
163 | rm -rf ${D}${localstatedir}/log | ||
162 | } | 164 | } |
163 | 165 | ||
164 | FILES_${PN} += "${systemd_system_unitdir}" | 166 | FILES_${PN} += "${systemd_system_unitdir}" |