nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch

132 lines
4.2 KiB
Diff
Raw Normal View History

2019-12-07 21:04:30 +00:00
diff --git a/collectors/Makefile.am b/collectors/Makefile.am
2021-05-04 18:15:53 +01:00
index 021e2ff23..115b88277 100644
2019-12-07 21:04:30 +00:00
--- a/collectors/Makefile.am
+++ b/collectors/Makefile.am
2021-05-04 18:15:53 +01:00
@@ -33,7 +33,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d
2019-12-07 21:04:30 +00:00
usergoconfigdir=$(configdir)/go.d
2020-02-22 07:45:50 +00:00
# Explicitly install directories to avoid permission issues due to umask
2019-12-07 21:04:30 +00:00
-install-exec-local:
2020-02-22 07:45:50 +00:00
+no-install-exec-local:
$(INSTALL) -d $(DESTDIR)$(usercustompluginsconfigdir)
$(INSTALL) -d $(DESTDIR)$(usergoconfigdir)
2019-06-26 18:38:01 +01:00
diff --git a/collectors/charts.d.plugin/Makefile.am b/collectors/charts.d.plugin/Makefile.am
2021-05-04 18:15:53 +01:00
index 03c7f0a94..01985db01 100644
2019-06-26 18:38:01 +01:00
--- a/collectors/charts.d.plugin/Makefile.am
+++ b/collectors/charts.d.plugin/Makefile.am
2020-02-22 07:45:50 +00:00
@@ -34,7 +34,7 @@ dist_userchartsconfig_DATA = \
$(NULL)
2020-02-22 07:45:50 +00:00
# Explicitly install directories to avoid permission issues due to umask
2019-12-07 21:04:30 +00:00
-install-exec-local:
2020-02-22 07:45:50 +00:00
+no-install-exec-local:
$(INSTALL) -d $(DESTDIR)$(userchartsconfigdir)
chartsconfigdir=$(libconfigdir)/charts.d
2021-05-04 18:15:53 +01:00
diff --git a/collectors/ebpf.plugin/Makefile.am b/collectors/ebpf.plugin/Makefile.am
2022-01-07 21:36:49 +00:00
index 2d5f92a6b..8b11c7502 100644
2021-05-04 18:15:53 +01:00
--- a/collectors/ebpf.plugin/Makefile.am
+++ b/collectors/ebpf.plugin/Makefile.am
2022-01-07 21:36:49 +00:00
@@ -9,7 +9,7 @@ SUFFIXES = .in
2021-05-04 18:15:53 +01:00
userebpfconfigdir=$(configdir)/ebpf.d
# Explicitly install directories to avoid permission issues due to umask
-install-exec-local:
+no-install-exec-local:
$(INSTALL) -d $(DESTDIR)$(userebpfconfigdir)
2022-01-07 21:36:49 +00:00
dist_noinst_DATA = \
2019-06-26 18:38:01 +01:00
diff --git a/collectors/node.d.plugin/Makefile.am b/collectors/node.d.plugin/Makefile.am
2021-05-04 18:15:53 +01:00
index c3142d433..95e324455 100644
2019-06-26 18:38:01 +01:00
--- a/collectors/node.d.plugin/Makefile.am
+++ b/collectors/node.d.plugin/Makefile.am
2020-02-22 07:45:50 +00:00
@@ -26,7 +26,7 @@ dist_usernodeconfig_DATA = \
$(NULL)
2020-02-22 07:45:50 +00:00
# Explicitly install directories to avoid permission issues due to umask
2019-12-07 21:04:30 +00:00
-install-exec-local:
2020-02-22 07:45:50 +00:00
+no-install-exec-local:
$(INSTALL) -d $(DESTDIR)$(usernodeconfigdir)
nodeconfigdir=$(libconfigdir)/node.d
2019-06-26 18:38:01 +01:00
diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am
2021-05-04 18:15:53 +01:00
index 38eb90f79..ce7079441 100644
2019-06-26 18:38:01 +01:00
--- a/collectors/python.d.plugin/Makefile.am
+++ b/collectors/python.d.plugin/Makefile.am
2020-02-22 07:45:50 +00:00
@@ -32,7 +32,7 @@ dist_userpythonconfig_DATA = \
$(NULL)
2020-02-22 07:45:50 +00:00
# Explicitly install directories to avoid permission issues due to umask
2019-12-07 21:04:30 +00:00
-install-exec-local:
2020-02-22 07:45:50 +00:00
+no-install-exec-local:
$(INSTALL) -d $(DESTDIR)$(userpythonconfigdir)
pythonconfigdir=$(libconfigdir)/python.d
2019-06-26 18:38:01 +01:00
diff --git a/collectors/statsd.plugin/Makefile.am b/collectors/statsd.plugin/Makefile.am
2021-05-04 18:15:53 +01:00
index 71f2d468d..2c9ced2bf 100644
2019-06-26 18:38:01 +01:00
--- a/collectors/statsd.plugin/Makefile.am
+++ b/collectors/statsd.plugin/Makefile.am
2021-05-04 18:15:53 +01:00
@@ -18,5 +18,5 @@ dist_userstatsdconfig_DATA = \
$(NULL)
2020-02-22 07:45:50 +00:00
# Explicitly install directories to avoid permission issues due to umask
2019-12-07 21:04:30 +00:00
-install-exec-local:
2020-02-22 07:45:50 +00:00
+no-install-exec-local:
$(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir)
2019-06-26 18:38:01 +01:00
diff --git a/health/Makefile.am b/health/Makefile.am
2022-01-07 21:36:49 +00:00
index 349b86d61..514f1874f 100644
2019-06-26 18:38:01 +01:00
--- a/health/Makefile.am
+++ b/health/Makefile.am
2020-02-22 07:45:50 +00:00
@@ -19,7 +19,7 @@ dist_userhealthconfig_DATA = \
$(NULL)
2020-02-22 07:45:50 +00:00
# Explicitly install directories to avoid permission issues due to umask
2019-12-07 21:04:30 +00:00
-install-exec-local:
2020-02-22 07:45:50 +00:00
+no-install-exec-local:
$(INSTALL) -d $(DESTDIR)$(userhealthconfigdir)
healthconfigdir=$(libconfigdir)/health.d
2019-06-26 18:38:01 +01:00
diff --git a/system/Makefile.am b/system/Makefile.am
2022-01-07 21:36:49 +00:00
index a88ccab65..bda6ee2b6 100644
2019-06-26 18:38:01 +01:00
--- a/system/Makefile.am
+++ b/system/Makefile.am
2022-01-07 21:36:49 +00:00
@@ -3,7 +3,6 @@
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
CLEANFILES = \
- edit-config \
netdata-openrc \
netdata.logrotate \
netdata.service \
@@ -20,15 +19,13 @@ include $(top_srcdir)/build/subst.inc
SUFFIXES = .in
2020-02-22 07:45:50 +00:00
dist_config_SCRIPTS = \
- edit-config \
2020-02-22 07:45:50 +00:00
$(NULL)
2022-01-07 21:36:49 +00:00
dist_config_DATA = \
- .install-type \
$(NULL)
2020-02-22 07:45:50 +00:00
# Explicitly install directories to avoid permission issues due to umask
2019-12-07 21:04:30 +00:00
-install-exec-local:
2020-02-22 07:45:50 +00:00
+no-install-exec-local:
$(INSTALL) -d $(DESTDIR)$(configdir)
nodist_noinst_DATA = \
2019-12-07 21:04:30 +00:00
diff --git a/web/Makefile.am b/web/Makefile.am
2021-05-04 18:15:53 +01:00
index ccaccd764..16a2977e5 100644
2019-12-07 21:04:30 +00:00
--- a/web/Makefile.am
+++ b/web/Makefile.am
2020-02-22 07:45:50 +00:00
@@ -12,7 +12,7 @@ SUBDIRS = \
2019-12-07 21:04:30 +00:00
usersslconfigdir=$(configdir)/ssl
2020-02-22 07:45:50 +00:00
# Explicitly install directories to avoid permission issues due to umask
2019-12-07 21:04:30 +00:00
-install-exec-local:
2020-02-22 07:45:50 +00:00
+no-install-exec-local:
$(INSTALL) -d $(DESTDIR)$(usersslconfigdir)
2019-12-07 21:04:30 +00:00
dist_noinst_DATA = \