chore: remove "web files" options leftovers (#12403)
Ilya Mashchenko committed
Mar 15, 2022 at 14:59 UTC
c05d44f59ee2a2e4c70a2c1dbbd295855ecef2bc
6 files changed
+6
-17
contrib/sles11/netdata-alarms-bash3.patch
-3
@@ -1,9 +1,6 @@
1
--- system/netdata.conf.orig 2018-05-10 19:44:49.000000000 +0300
2
+++ system/netdata.conf 2018-05-10 19:45:14.000000000 +0300
3
@@ -22,3 +22,7 @@
4
- [web]
5
- web files owner = root
6
- web files group = netdata
4
+
5
+[health]
6
+ # script for sles 11, mail notifications only
daemon/main.c
-6
@@ -445,12 +445,6 @@ static void backwards_compatible_config() {
445
446
config_move(CONFIG_SECTION_GLOBAL, "web compression level",
447
CONFIG_SECTION_WEB, "gzip compression level");
448
-
449
- config_move(CONFIG_SECTION_GLOBAL, "web files owner",
450
- CONFIG_SECTION_WEB, "web files owner");
451
-
452
- config_move(CONFIG_SECTION_GLOBAL, "web files group",
453
- CONFIG_SECTION_WEB, "web files group");
448
}
449
450
static void get_netdata_configured_variables() {
packaging/docker/run.sh
+1
-1
@@ -52,4 +52,4 @@ if [ -n "${NETDATA_CLAIM_URL}" ] && [ -n "${NETDATA_CLAIM_TOKEN}" ] && [ ! -f /v
52
-daemon-not-running
53
fi
54
55
-exec /usr/sbin/netdata -u "${DOCKER_USR}" -D -s /host -p "${NETDATA_LISTENER_PORT}" -W set web "web files group" root -W set web "web files owner" root "$@"
55
+exec /usr/sbin/netdata -u "${DOCKER_USR}" -D -s /host -p "${NETDATA_LISTENER_PORT}" "$@"
packaging/installer/methods/synology.md
+1
-3
@@ -34,9 +34,7 @@ chown -R netdata:netdata /opt/netdata/var/lib/netdata /opt/netdata/var/cache/net
34
chown -R netdata:root /opt/netdata/var/log/netdata
35
```
36
37
-4. Uncomment and set `web files owner` to `root`, and `web files group` to `netdata` in
38
- the `/opt/netdata/etc/netdata/netdata.conf`.
39
-5. Restart Netdata
37
+4. Restart Netdata
38
39
```sh
40
/etc/rc.netdata restart
web/api/tests/valid_urls.c
+2
-2
@@ -75,9 +75,9 @@ void __wrap_finished_web_request_statistics(
75
76
char *__wrap_config_get(struct config *root, const char *section, const char *name, const char *default_value)
77
{
78
- if (!strcmp(section, CONFIG_SECTION_WEB) && !strcmp(name, "web files owner"))
79
- return "netdata";
78
(void)root;
79
+ (void)section;
80
+ (void)name;
81
(void)default_value;
82
return "UNKNOWN FIX ME";
83
}
web/api/tests/web_api.c
+2
-2
@@ -75,9 +75,9 @@ void __wrap_finished_web_request_statistics(
75
76
char *__wrap_config_get(struct config *root, const char *section, const char *name, const char *default_value)
77
{
78
- if (!strcmp(section, CONFIG_SECTION_WEB) && !strcmp(name, "web files owner"))
79
- return "netdata";
78
(void)root;
79
+ (void)section;
80
+ (void)name;
81
(void)default_value;
82
return "UNKNOWN FIX ME";
83
}