diff options
Diffstat (limited to 'system/netdata')
-rw-r--r-- | system/netdata/logrotate-use-netdata-user-and-group.diff | 9 | ||||
-rw-r--r-- | system/netdata/netdata.SlackBuild | 15 | ||||
-rw-r--r-- | system/netdata/netdata.info | 6 | ||||
-rw-r--r-- | system/netdata/rc.netdata | 7 |
4 files changed, 30 insertions, 7 deletions
diff --git a/system/netdata/logrotate-use-netdata-user-and-group.diff b/system/netdata/logrotate-use-netdata-user-and-group.diff new file mode 100644 index 0000000000..1a4b2dc3aa --- /dev/null +++ b/system/netdata/logrotate-use-netdata-user-and-group.diff @@ -0,0 +1,9 @@ +diff -Nur netdata-v2.3.1.orig/system/logrotate/netdata.in netdata-v2.3.1/system/logrotate/netdata.in +--- netdata-v2.3.1.orig/system/logrotate/netdata.in 2025-03-24 11:35:23.923540833 -0500 ++++ netdata-v2.3.1/system/logrotate/netdata.in 2025-03-30 00:11:07.041042866 -0500 +@@ -1,4 +1,5 @@ + @localstatedir_POST@/log/netdata/*.log { ++ su @NETDATAUSER@ @NETDATAGROUP@ + daily + missingok + rotate 14 diff --git a/system/netdata/netdata.SlackBuild b/system/netdata/netdata.SlackBuild index 28590ad00a..f707b55659 100644 --- a/system/netdata/netdata.SlackBuild +++ b/system/netdata/netdata.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=netdata -VERSION=${VERSION:-2.3.1} +VERSION=${VERSION:-2.3.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -91,6 +91,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# logrotate needs to su to the netdata user and group before rotating logs: +sed -e s,@NETDATA_USER@,$NETDATA_USER, -e s,@NETDATA_GROUP@,$NETDATA_GROUP, \ + $CWD/logrotate-use-netdata-user-and-group.diff | patch -p1 --verbose + # wsr # Somehow abseil-cpp that we have in SBo or current is too new # So we will use the bundled protobuf in order to build for now @@ -111,8 +115,9 @@ cd build -DENABLE_ACLK=FALSE \ -DENABLE_BUNDLED_PROTOBUF=TRUE \ -DCMAKE_BUILD_TYPE=Release .. - make - make install/strip DESTDIR=$PKG + cmake --build ../build + DESTDIR=$PKG cmake --install ../build + #make install/strip DESTDIR=$PKG cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ @@ -132,7 +137,9 @@ chown -R $NETDATA_USER:$NETDATA_GROUP $PKG/usr/share/netdata/web chown -R $NETDATA_USER:$NETDATA_GROUP $PKG/etc/netdata mkdir -p $PKG/etc/rc.d/ -install -m 0644 $CWD/rc.netdata $PKG/etc/rc.d/ +sed -e s,@NETDATA_USER@,$NETDATA_USER, -e s,@NETDATA_GROUP@,$NETDATA_GROUP, $CWD/rc.netdata \ + > $PKG/etc/rc.d/rc.netdata +chmod 0644 $PKG/etc/rc.d/rc.netdata # handle all conf files cp system/netdata.conf $PKG/etc/netdata/netdata.conf.new diff --git a/system/netdata/netdata.info b/system/netdata/netdata.info index ca6dff2a33..95cd1501b3 100644 --- a/system/netdata/netdata.info +++ b/system/netdata/netdata.info @@ -1,8 +1,8 @@ PRGNAM="netdata" -VERSION="2.3.1" +VERSION="2.3.2" HOMEPAGE="https://github.com/netdata/netdata" -DOWNLOAD="https://github.com/netdata/netdata/releases/download/v2.3.1/netdata-v2.3.1.tar.gz" -MD5SUM="a22965f684f8126a70045b77753062c6" +DOWNLOAD="https://github.com/netdata/netdata/releases/download/v2.3.2/netdata-v2.3.2.tar.gz" +MD5SUM="4759c9c8fb5937390d38b6d231501f76" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python2-PyYAML google-go-lang freeipmi" diff --git a/system/netdata/rc.netdata b/system/netdata/rc.netdata index 7e98a703db..1effc279c2 100644 --- a/system/netdata/rc.netdata +++ b/system/netdata/rc.netdata @@ -6,10 +6,17 @@ PIDFILE=/var/run/$DAEMON.pid DAEMONOPTS="-P $PIDFILE" LOCKFILE=/var/lock/subsys/$DAEMON +create_needed_dirs() +{ + mkdir -p /var/lock/subsys /var/cache/netdata /var/log/netdata + chown -R @NETDATA_USER@:@NETDATA_GROUP /var/cache/netdata /var/log/netdata +} + service_start() { [ -x $DAEMON_PATH ] || exit 5 echo "Starting $DAEMON..." + create_needed_dirs if [ -e "$LOCKFILE" ]; then echo "netdata server already running!" echo "Please remove $LOCKFILE" |