@cryptotaxi247 / netdata-1 / commits / 7ffe27a82

spec: Runtime changes

Add soft runtime requirements Add capabilities to apps.plugin Add & join docker group on install

Ben Reedy committed Dec 22, 2016 at 17:15 UTC 7ffe27a8236171c8fe49d58cae4bce00fa9d1dc1
1 file changed +17 -4
netdata.spec.in
+17 -4
@@ -41,8 +41,18 @@ BuildRequires: pkgconfig
41 BuildRequires: xz
42 BuildRequires: zlib-devel
43 BuildRequires: libuuid-devel
44 -Requires: zlib
45 -Requires: libuuid
44 +Requires: zlib
45 +Requires: libuuid
46 +Requires(post): libcap
47 +Recommends: curl
48 +Recommends: iproute-tc
49 +Recommends: lm_sensors
50 +Recommends: nmap-ncat
51 +Recommends: nodejs
52 +Recommends: python
53 +Recommends: PyYAML
54 +Recommends: python2-PyMySQL
55 +Recommends: python2-psycopg2
56
57 # Packages can be found in the EPEL repo
58 %if %{with nfacct}
@@ -129,8 +139,9 @@ setcap cap_dac_read,cap_sys_ptrace+ep /usr/libexec/netdata/plugins.d/apps.plugin
139 %pre
140 # Add the "netdata" user
141 getent group netdata >/dev/null || groupadd -r netdata
142 +getent group docker >/dev/null || groupadd -r docker
143 getent passwd netdata >/dev/null || \
133 - useradd -r -g netdata -s /sbin/nologin \
144 + useradd -r -g netdata -G docker -s /sbin/nologin \
145 -d %{contentdir} -c "netdata" netdata
146 exit 0
147
@@ -173,13 +184,15 @@ rm -rf $RPM_BUILD_ROOT
184 %config(noreplace) %{_sysconfdir}/%{name}/*.conf
185 %config(noreplace) %{_sysconfdir}/%{name}/charts.d/*.conf
186 %config(noreplace) %{_sysconfdir}/%{name}/health.d/*.conf
176 -%config(noreplace) %{_sysconfdir}/%{name}/node.d/*.conf
187 +#%%config(noreplace) %{_sysconfdir}/%{name}/node.d/*.conf
188 %config(noreplace) %{_sysconfdir}/%{name}/python.d/*.conf
189 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
190
191 # To be eventually moved to %%_defaultdocdir
192 %{_sysconfdir}/%{name}/node.d/*.md
193
194 +%caps(cap_dac_read_search,cap_sys_ptrace=ep) %{_libexecdir}/%{name}/plugins.d/apps.plugin
195 +
196 %{_libexecdir}/%{name}
197 %{_sbindir}/%{name}
198