archive/netdata_netdata
0
0
Fork 0
mirror of https://github.com/netdata/netdata.git synced 2025-05-10 11:50:55 +00:00
Code Issues Projects Releases Wiki Activity

chore: remove "web files" options leftovers ()

Browse source
This commit is contained in:
Ilya Mashchenko 2022-03-15 14:59:16 +02:00 • committed by GitHub
parent 1af82e4afb
commit c05d44f59e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 17 deletions
contrib/sles11
netdata-alarms-bash3.patch
daemon
main.c
packaging
docker
run.sh
installer/methods
synology.md
web/api/tests
valid_urls.cweb_api.c

3
contrib/sles11/netdata-alarms-bash3.patch
View file

@ -1,9 +1,6 @@
--- system/netdata.conf.orig 2018-05-10 19:44:49.000000000 +0300 --- system/netdata.conf.orig 2018-05-10 19:44:49.000000000 +0300
+++ system/netdata.conf 2018-05-10 19:45:14.000000000 +0300 +++ system/netdata.conf 2018-05-10 19:45:14.000000000 +0300
@@ -22,3 +22,7 @@ @@ -22,3 +22,7 @@
[web]
web files owner = root
web files group = netdata
+ +
+[health] +[health]
+ # script for sles 11, mail notifications only + # script for sles 11, mail notifications only

6
daemon/main.c
View file

@ -445,12 +445,6 @@ static void backwards_compatible_config() {
config_move(CONFIG_SECTION_GLOBAL, "web compression level", config_move(CONFIG_SECTION_GLOBAL, "web compression level",
CONFIG_SECTION_WEB, "gzip compression level"); CONFIG_SECTION_WEB, "gzip compression level");
config_move(CONFIG_SECTION_GLOBAL, "web files owner",
CONFIG_SECTION_WEB, "web files owner");
config_move(CONFIG_SECTION_GLOBAL, "web files group",
CONFIG_SECTION_WEB, "web files group");
} }
static void get_netdata_configured_variables() { static void get_netdata_configured_variables() {

2
packaging/docker/run.sh
View file

@ -52,4 +52,4 @@ if [ -n "${NETDATA_CLAIM_URL}" ] && [ -n "${NETDATA_CLAIM_TOKEN}" ] && [ ! -f /v
-daemon-not-running -daemon-not-running
fi fi
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 "$@" exec /usr/sbin/netdata -u "${DOCKER_USR}" -D -s /host -p "${NETDATA_LISTENER_PORT}" "$@"

4
packaging/installer/methods/synology.md
View file

@ -34,9 +34,7 @@ chown -R netdata:netdata /opt/netdata/var/lib/netdata /opt/netdata/var/cache/net
chown -R netdata:root /opt/netdata/var/log/netdata chown -R netdata:root /opt/netdata/var/log/netdata
``` ```
4. Uncomment and set `web files owner` to `root`, and `web files group` to `netdata` in 4. Restart Netdata
the `/opt/netdata/etc/netdata/netdata.conf`.
5. Restart Netdata
```sh ```sh
/etc/rc.netdata restart /etc/rc.netdata restart

4
web/api/tests/valid_urls.c
View file

@ -75,9 +75,9 @@ void __wrap_finished_web_request_statistics(
char *__wrap_config_get(struct config *root, const char *section, const char *name, const char *default_value) char *__wrap_config_get(struct config *root, const char *section, const char *name, const char *default_value)
{ {
if (!strcmp(section, CONFIG_SECTION_WEB) && !strcmp(name, "web files owner"))
return "netdata";
(void)root; (void)root;
(void)section;
(void)name;
(void)default_value; (void)default_value;
return "UNKNOWN FIX ME"; return "UNKNOWN FIX ME";
} }

4
web/api/tests/web_api.c
View file

@ -75,9 +75,9 @@ void __wrap_finished_web_request_statistics(
char *__wrap_config_get(struct config *root, const char *section, const char *name, const char *default_value) char *__wrap_config_get(struct config *root, const char *section, const char *name, const char *default_value)
{ {
if (!strcmp(section, CONFIG_SECTION_WEB) && !strcmp(name, "web files owner"))
return "netdata";
(void)root; (void)root;
(void)section;
(void)name;
(void)default_value; (void)default_value;
return "UNKNOWN FIX ME"; return "UNKNOWN FIX ME";
} }