From 7ffe27a8236171c8fe49d58cae4bce00fa9d1dc1 Mon Sep 17 00:00:00 2001 From: Ben Reedy Date: Thu, 22 Dec 2016 17:15:40 +1000 Subject: [PATCH] spec: Runtime changes Add soft runtime requirements Add capabilities to apps.plugin Add & join docker group on install --- netdata.spec.in | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/netdata.spec.in b/netdata.spec.in index 53afcb98..fc4565e3 100644 --- a/netdata.spec.in +++ b/netdata.spec.in @@ -41,8 +41,18 @@ BuildRequires: pkgconfig BuildRequires: xz BuildRequires: zlib-devel BuildRequires: libuuid-devel -Requires: zlib -Requires: libuuid +Requires: zlib +Requires: libuuid +Requires(post): libcap +Recommends: curl +Recommends: iproute-tc +Recommends: lm_sensors +Recommends: nmap-ncat +Recommends: nodejs +Recommends: python +Recommends: PyYAML +Recommends: python2-PyMySQL +Recommends: python2-psycopg2 # Packages can be found in the EPEL repo %if %{with nfacct} @@ -129,8 +139,9 @@ setcap cap_dac_read,cap_sys_ptrace+ep /usr/libexec/netdata/plugins.d/apps.plugin %pre # Add the "netdata" user getent group netdata >/dev/null || groupadd -r netdata +getent group docker >/dev/null || groupadd -r docker getent passwd netdata >/dev/null || \ - useradd -r -g netdata -s /sbin/nologin \ + useradd -r -g netdata -G docker -s /sbin/nologin \ -d %{contentdir} -c "netdata" netdata exit 0 @@ -173,13 +184,15 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/%{name}/*.conf %config(noreplace) %{_sysconfdir}/%{name}/charts.d/*.conf %config(noreplace) %{_sysconfdir}/%{name}/health.d/*.conf -%config(noreplace) %{_sysconfdir}/%{name}/node.d/*.conf +#%%config(noreplace) %{_sysconfdir}/%{name}/node.d/*.conf %config(noreplace) %{_sysconfdir}/%{name}/python.d/*.conf %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} # To be eventually moved to %%_defaultdocdir %{_sysconfdir}/%{name}/node.d/*.md +%caps(cap_dac_read_search,cap_sys_ptrace=ep) %{_libexecdir}/%{name}/plugins.d/apps.plugin + %{_libexecdir}/%{name} %{_sbindir}/%{name} -- 2.39.2