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

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

116 lines
3.8 KiB
Diff
Raw Normal View History

2019-12-07 21:04:30 +00:00
diff --git a/collectors/Makefile.am b/collectors/Makefile.am
index 2aec3dd3e..27385ec28 100644
2019-12-07 21:04:30 +00:00
--- a/collectors/Makefile.am
+++ b/collectors/Makefile.am
@@ -31,7 +31,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 17:38:01 +00:00
diff --git a/collectors/charts.d.plugin/Makefile.am b/collectors/charts.d.plugin/Makefile.am
2021-05-04 17:15:53 +00:00
index 03c7f0a94..01985db01 100644
2019-06-26 17:38:01 +00: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 17:15:53 +00: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 17:15:53 +00: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 17:15:53 +00: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 17:38:01 +00:00
diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am
index ca49c1c02..1b9bcc446 100644
2019-06-26 17:38:01 +00: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 17:38:01 +00:00
diff --git a/collectors/statsd.plugin/Makefile.am b/collectors/statsd.plugin/Makefile.am
2022-06-18 20:21:18 +00:00
index c8144c137..f8aaa89b6 100644
2019-06-26 17:38:01 +00:00
--- a/collectors/statsd.plugin/Makefile.am
+++ b/collectors/statsd.plugin/Makefile.am
2022-06-18 20:21:18 +00:00
@@ -19,5 +19,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 17:38:01 +00:00
diff --git a/health/Makefile.am b/health/Makefile.am
index 20e000860..add0137b3 100644
2019-06-26 17:38:01 +00: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 17:38:01 +00:00
diff --git a/system/Makefile.am b/system/Makefile.am
index 54e9278c8..e7cc7acea 100644
2019-06-26 17:38:01 +00:00
--- a/system/Makefile.am
+++ b/system/Makefile.am
@@ -21,12 +21,9 @@ 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 \
- netdata-updater.conf \
2022-01-07 21:36:49 +00:00
$(NULL)
libconfigvnodesdir=$(libconfigdir)/vnodes
@@ -46,7 +43,7 @@ libsysrunitdir=$(libsysdir)/runit
libsyssystemddir=$(libsysdir)/systemd
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)
$(INSTALL) -d $(DESTDIR)$(libsysdir)
$(INSTALL) -d $(DESTDIR)$(libsyscrondir)
2019-12-07 21:04:30 +00:00
diff --git a/web/Makefile.am b/web/Makefile.am
index be2c545c3..55f373114 100644
2019-12-07 21:04:30 +00:00
--- a/web/Makefile.am
+++ b/web/Makefile.am
@@ -13,7 +13,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 = \