diff options
Diffstat (limited to 'meta-openembedded/meta-webserver')
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.49.bb (renamed from meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.48.bb) | 3 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.service | 12 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb | 19 |
3 files changed, 22 insertions, 12 deletions
diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.48.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.49.bb index 1ac4fcbf26..e5d1879578 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.48.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.49.bb @@ -26,8 +26,7 @@ SRC_URI:append:class-target = " \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" -SRC_URI[md5sum] = "a7088cec171b0d00bf43394ce64d3909" -SRC_URI[sha256sum] = "1bc826e7b2e88108c7e4bf43c026636f77a41d849cfb667aa7b5c0b86dbf966c" +SRC_URI[sha256sum] = "65b965d6890ea90d9706595e4b7b9365b5060bec8ea723449480b4769974133b" S = "${WORKDIR}/httpd-${PV}" diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.service b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.service index b244d18665..ca13f72871 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.service +++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.service @@ -1,13 +1,15 @@ +# SPDX-License-Identifier: GPL-3.0-or-later [Unit] -Description=Netdata, Real-time performance monitoring +Description=Real time performance monitoring RequiresMountsFor=/var +After=network.target [Service] -User=root +Type=simple ExecStartPre=/bin/mkdir -p /var/log/netdata -ExecStartPre=/bin/chown -R nobody.netdata @@datadir/netdata/web -ExecStartPre=/bin/chown -R nobody.netdata /var/cache/netdata -ExecStart=/usr/sbin/netdata -nd +ExecStartPre=/bin/chown -R netdata.netdata /var/log/netdata +ExecStart=/usr/sbin/netdata -D -u netdata + [Install] WantedBy=multi-user.target diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb index 7c48b8a37d..7ec9898152 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb +++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb @@ -1,17 +1,19 @@ -HOMEPAGE = "https://github.com/firehol/netdata/" +HOMEPAGE = "https://github.com/netdata/netdata/" SUMMARY = "Real-time performance monitoring" +DESCRIPTION = "Netdata is high-fidelity infrastructure monitoring and troubleshooting. \ + Open-source, free, preconfigured, opinionated, and always real-time." LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" -SRC_URI = "git://github.com/firehol/netdata.git;protocol=https" +SRC_URI:append = " git://github.com/firehol/netdata.git;protocol=https" SRCREV = "1be9200ba8e11dc81a2101d85a2725137d43f766" PV = "1.22.1" # default netdata.conf for netdata configuration -SRC_URI += "file://netdata.conf" +SRC_URI += " file://netdata.conf" # file for providing systemd service support -SRC_URI += "file://netdata.service" +SRC_URI += " file://netdata.service" S = "${WORKDIR}/git" @@ -31,7 +33,7 @@ SYSTEMD_AUTO_ENABLE:${PN} = "enable" #User specific USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM:${PN} = "--system netdata" +USERADD_PARAM:${PN} = "--system --no-create-home --home-dir ${localstatedir}/run/netdata --user-group netdata" do_install:append() { #set S UID for plugins @@ -50,6 +52,13 @@ do_install:append() { sed -i -e 's,@@sysconfdir,${sysconfdir},g' ${D}${sysconfdir}/netdata/netdata.conf sed -i -e 's,@@libdir,${libexecdir},g' ${D}${sysconfdir}/netdata/netdata.conf sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf + + install --group netdata --owner netdata --directory ${D}${localstatedir}/cache/netdata + install --group netdata --owner netdata --directory ${D}${localstatedir}/lib/netdata + + chown -R netdata:netdata ${D}${datadir}/netdata/web } +FILES_${PN} += "${localstatedir}/cache/netdata/ ${localstatedir}/lib/netdata/" + RDEPENDS:${PN} = "bash zlib" |