fix netdata.spec for new directory structure (#4410)
* fix netdata.spec; fixes #4409 * second pass * more netdata.spec fixes * more netdata.spec fixes * more netdata.spec fixes * more netdata.spec fixes * more netdata.spec fixes
Costa Tsaousis committed
Oct 16, 2018 at 22:33 UTC
203aea6102e03f6e276865904a331bbefca7604f
6 files changed
+49
-17
collectors/charts.d.plugin/Makefile.am
+6
@@ -30,8 +30,14 @@ dist_charts_SCRIPTS = \
30
dist_charts_DATA = \
31
$(NULL)
32
33
+userchartsconfigdir=$(configdir)/charts.d
34
+dist_userchartsconfig_DATA = \
35
+ $(top_srcdir)/installer/.keep \
36
+ $(NULL)
37
+
38
chartsconfigdir=$(libconfigdir)/charts.d
39
dist_chartsconfig_DATA = \
40
+ $(top_srcdir)/installer/.keep \
41
$(NULL)
42
43
include ap/Makefile.inc
collectors/node.d.plugin/Makefile.am
+6
@@ -21,8 +21,14 @@ dist_noinst_DATA = \
21
README.md \
22
$(NULL)
23
24
+usernodeconfigdir=$(configdir)/node.d
25
+dist_usernodeconfig_DATA = \
26
+ $(top_srcdir)/installer/.keep \
27
+ $(NULL)
28
+
29
nodeconfigdir=$(libconfigdir)/node.d
30
dist_nodeconfig_DATA = \
31
+ $(top_srcdir)/installer/.keep \
32
$(NULL)
33
34
dist_node_DATA = \
collectors/python.d.plugin/Makefile.am
+10
-4
@@ -21,16 +21,22 @@ dist_noinst_DATA = \
21
README.md \
22
$(NULL)
23
24
-pythonconfigdir=$(libconfigdir)/python.d
25
-dist_pythonconfig_DATA = \
26
- $(NULL)
27
-
24
dist_python_SCRIPTS = \
25
$(NULL)
26
27
dist_python_DATA = \
28
$(NULL)
29
30
+userpythonconfigdir=$(configdir)/python.d
31
+dist_userpythonconfig_DATA = \
32
+ $(top_srcdir)/installer/.keep \
33
+ $(NULL)
34
+
35
+pythonconfigdir=$(libconfigdir)/python.d
36
+dist_pythonconfig_DATA = \
37
+ $(top_srcdir)/installer/.keep \
38
+ $(NULL)
39
+
40
include apache/Makefile.inc
41
include beanstalk/Makefile.inc
42
include bind_rndc/Makefile.inc
collectors/statsd.plugin/Makefile.am
+7
@@ -9,5 +9,12 @@ dist_noinst_DATA = \
9
10
statsdconfigdir=$(libconfigdir)/statsd.d
11
dist_statsdconfig_DATA = \
12
+ $(top_srcdir)/installer/.keep \
13
example.conf \
14
$(NULL)
15
+
16
+userstatsdconfigdir=$(configdir)/statsd.d
17
+dist_userstatsdconfig_DATA = \
18
+ $(top_srcdir)/installer/.keep \
19
+ $(NULL)
20
+
health/Makefile.am
+6
@@ -26,8 +26,14 @@ dist_noinst_DATA = \
26
README.md \
27
$(NULL)
28
29
+userhealthconfigdir=$(configdir)/health.d
30
+dist_userhealthconfig_DATA = \
31
+ $(top_srcdir)/installer/.keep \
32
+ $(NULL)
33
+
34
healthconfigdir=$(libconfigdir)/health.d
35
dist_healthconfig_DATA = \
36
+ $(top_srcdir)/installer/.keep \
37
health.d/apache.conf \
38
health.d/apcupsd.conf \
39
health.d/backend.conf \
netdata.spec.in
+14
-13
@@ -183,18 +183,18 @@ rm -rf "${RPM_BUILD_ROOT}"
183
%dir %{_sysconfdir}/%{name}
184
%dir %{_libdir}/%{name}
185
186
-%config %{_libdir}/%{name}/*.conf
187
-%config %{_libdir}/%{name}/charts.d/*.conf
188
-%config %{_libdir}/%{name}/health.d/*.conf
189
-%config %{_libdir}/%{name}/node.d/*.conf
190
-%config %{_libdir}/%{name}/python.d/*.conf
191
-%config %{_libdir}/%{name}/statsd.d/*.conf
186
+%config %{_sysconfdir}/%{name}/*.conf
187
+#%config %{_sysconfdir}/%{name}/charts.d/*.conf
188
+#%config %{_sysconfdir}/%{name}/health.d/*.conf
189
+#%config %{_sysconfdir}/%{name}/node.d/*.conf
190
+#%config %{_sysconfdir}/%{name}/python.d/*.conf
191
+#%config %{_sysconfdir}/%{name}/statsd.d/*.conf
192
%config %{_sysconfdir}/logrotate.d/%{name}
193
194
-# To be eventually moved to %%_defaultdocdir
195
-%{_libdir}/%{name}/node.d/*.md
194
+%{_libdir}/%{name}
195
%{_libexecdir}/%{name}
196
%{_sbindir}/%{name}
197
+%{_sysconfdir}/%{name}/edit-config
198
199
%caps(cap_dac_read_search,cap_sys_ptrace=ep) %attr(0550,root,netdata) %{_libexecdir}/%{name}/plugins.d/apps.plugin
200
@@ -215,17 +215,18 @@ rm -rf "${RPM_BUILD_ROOT}"
215
%attr(0770,netdata,netdata) %dir %{_localstatedir}/lib/%{name}
216
217
%dir %{_datadir}/%{name}
218
+
219
%dir %{_sysconfdir}/%{name}/health.d
219
-%dir %{_libdir}/%{name}/health.d
220
%dir %{_sysconfdir}/%{name}/python.d
221
-%dir %{_libdir}/%{name}/python.d
221
%dir %{_sysconfdir}/%{name}/charts.d
223
-%dir %{_libdir}/%{name}/charts.d
222
%dir %{_sysconfdir}/%{name}/node.d
225
-%dir %{_libdir}/%{name}/node.d
223
%dir %{_sysconfdir}/%{name}/statsd.d
227
-%dir %{_libdir}/%{name}/statsd.d
224
225
+%dir %{_libdir}/%{name}/conf.d/health.d
226
+%dir %{_libdir}/%{name}/conf.d/python.d
227
+%dir %{_libdir}/%{name}/conf.d/charts.d
228
+%dir %{_libdir}/%{name}/conf.d/node.d
229
+%dir %{_libdir}/%{name}/conf.d/statsd.d
230
231
%if %{with systemd}
232
%{_unitdir}/netdata.service