diff --git a/contrib/sles11/netdata-alarms-bash3.patch b/contrib/sles11/netdata-alarms-bash3.patch index 142659ba90..341c9c2ee6 100644 --- a/contrib/sles11/netdata-alarms-bash3.patch +++ b/contrib/sles11/netdata-alarms-bash3.patch @@ -1,9 +1,6 @@ --- system/netdata.conf.orig 2018-05-10 19:44:49.000000000 +0300 +++ system/netdata.conf 2018-05-10 19:45:14.000000000 +0300 @@ -22,3 +22,7 @@ - [web] - web files owner = root - web files group = netdata + +[health] + # script for sles 11, mail notifications only diff --git a/daemon/main.c b/daemon/main.c index 60c3b9e7e9..418adec476 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -445,12 +445,6 @@ static void backwards_compatible_config() { config_move(CONFIG_SECTION_GLOBAL, "web 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() { diff --git a/packaging/docker/run.sh b/packaging/docker/run.sh index e0fa697f7c..bb9b902b53 100755 --- a/packaging/docker/run.sh +++ b/packaging/docker/run.sh @@ -52,4 +52,4 @@ if [ -n "${NETDATA_CLAIM_URL}" ] && [ -n "${NETDATA_CLAIM_TOKEN}" ] && [ ! -f /v -daemon-not-running 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}" "$@" diff --git a/packaging/installer/methods/synology.md b/packaging/installer/methods/synology.md index ed68880a01..30ec3035c1 100644 --- a/packaging/installer/methods/synology.md +++ b/packaging/installer/methods/synology.md @@ -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 ``` -4. Uncomment and set `web files owner` to `root`, and `web files group` to `netdata` in - the `/opt/netdata/etc/netdata/netdata.conf`. -5. Restart Netdata +4. Restart Netdata ```sh /etc/rc.netdata restart diff --git a/web/api/tests/valid_urls.c b/web/api/tests/valid_urls.c index 30ae23247c..30dc298285 100644 --- a/web/api/tests/valid_urls.c +++ b/web/api/tests/valid_urls.c @@ -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) { - if (!strcmp(section, CONFIG_SECTION_WEB) && !strcmp(name, "web files owner")) - return "netdata"; (void)root; + (void)section; + (void)name; (void)default_value; return "UNKNOWN FIX ME"; } diff --git a/web/api/tests/web_api.c b/web/api/tests/web_api.c index b96213255b..df4efdabd2 100644 --- a/web/api/tests/web_api.c +++ b/web/api/tests/web_api.c @@ -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) { - if (!strcmp(section, CONFIG_SECTION_WEB) && !strcmp(name, "web files owner")) - return "netdata"; (void)root; + (void)section; + (void)name; (void)default_value; return "UNKNOWN FIX ME"; }