starlingx/meta-starlingx
Code Issues Proposed changes

audit: move StarlingX config to bbappend

Browse Source 
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Babak Sarashki <Babak.SarAshki@windriver.com>
This commit is contained in:
Saul Wold 2020-07-06 15:27:22 -07:00 committed by Babak Sarashki
parent ebca50196c
commit 01a2b56a4a
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
meta-stx-flock/stx-config-files/config-files_1.0.0.bb
View File

@ -12,7 +12,6 @@ PV = "1.0.0"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "\
file://systemd-config/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://audit-config/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://docker-config/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://filesystem-scripts/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://filesystem-scripts/filesystem-scripts-1.0/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@ -55,7 +54,6 @@ do_install () {
}
PACKAGES ?= ""
PACKAGES += "audit-config"
PACKAGES += "dhclient-config"
PACKAGES += "dnsmasq-config"
PACKAGES += "docker-config"
@ -85,7 +83,6 @@ PACKAGES += "systemd-config"
PACKAGES += "util-linux-config"
FILES_audit-config = "${datadir}/starlingx/config-files/audit-config/"
FILES_dhclient-config = "${datadir}/starlingx/config-files/dhcp-config/"
FILES_dnsmasq-config = "${datadir}/starlingx/config-files/dnsmasq-config/"
FILES_docker-config = "${datadir}/starlingx/config-files/docker-config/"
@ -114,11 +111,6 @@ FILES_syslog-ng-config= "${datadir}/starlingx/config-files/syslog-ng-config/"
FILES_systemd-config= "${datadir}/starlingx/config-files/systemd-config/"
FILES_util-linux-config= "${datadir}/starlingx/config-files/util-linux-config/"
RDEPENDS_audit-config += " \
audit \
auditd \
audit-python \
"
RDEPENDS_dhclient-config += "dhcp-client"
RDEPENDS_dnsmasq-config += "dnsmasq"
RDEPENDS_docker-config += "docker-ce logrotate "
@ -217,11 +209,6 @@ RDEPENDS_syslog-ng-config += " syslog-ng"
RDEPENDS_systemd-config += " systemd"
RDEPENDS_util-linux-config += " util-linux"
pkg_postinst_ontarget_audit-config() {
cp -f ${datadir}/starlingx/config-files/audit-config/files/syslog.conf ${sysconfdir}/audisp/plugins.d/syslog.conf
chmod 640 ${sysconfdir}/audisp/plugins.d/syslog.conf
}
pkg_postinst_ontarget_dhclient-config() {
SRCPATH=${datadir}/starlingx/config-files/dhcp-config/files
install -m 0755 -p ${SRCPATH}/dhclient-enter-hooks ${sysconfdir}/dhcp/dhclient-enter-hooks

15
meta-stx-integ/recipes-security/audit/audit_%.bbappend Normal file
View File

@ -0,0 +1,15 @@
SRCREV_FORMAT = "configfiles"
SRCREV_configfiles = "d778e862571957ece3c404c0c37d325769772fde"
SRC_URI += "\
git://opendev.org/starlingx/config-files.git;protocol=https;branch=r/stx.3.0;destsuffix=stx_configfiles;name=configfiles;subpath=audit-config \
"
do_unpack_append () {
bb.build.exec_func('do_copy_audit_config', d)
}
do_copy_audit_config () {
cp -f ${WORKDIR}/stx_configfiles/files/syslog.conf ${S}/audisp/plugins/builtins/syslog.conf
}