diff options
author | Timo <6674623+underhood@users.noreply.github.com> | 2020-04-01 17:31:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-01 17:31:57 +0200 |
commit | f292b0975dfd5c915d9ddcb19ceca3c5caa73508 (patch) | |
tree | 906abb690e0304283145f42421783a7b89f467ea /claim | |
parent | dd0c426940d850f19c8641657fcb030f1abcf78d (diff) |
Fix regressions in cloud functionality (build, CI, claiming) (#8568)
Fixes regressions in the configure script and build introduced by last night's patch (underhood). Improved the CI/CD to test ACLK builds + Installer changes (ferroin). Removed TLS from libmosquitto. Fixed a problem with user accounts for claiming. (amoss)
Co-authored-by: Austin S. Hemmelgarn <austin@netdata.cloud>
Co-authored-by: Andrew Moss <1043609+amoss@users.noreply.github.com>
Diffstat (limited to 'claim')
-rwxr-xr-x | claim/netdata-claim.sh.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/claim/netdata-claim.sh.in b/claim/netdata-claim.sh.in index c2c9bb64e0..0d31e33017 100755 --- a/claim/netdata-claim.sh.in +++ b/claim/netdata-claim.sh.in @@ -109,7 +109,7 @@ RELOAD=1 NETDATA_USER=netdata [ -z "$EUID" ] && EUID="$(id -u)" -CONF_USER=$(grep '^[^#]*run as user[ \t]*=' "${NETDATA_USER_CONFIG_DIR}/netdata.conf" 2>/dev/null) +CONF_USER=$(grep '^[ #]*run as user[ ]*=' "${NETDATA_USER_CONFIG_DIR}/netdata.conf" 2>/dev/null) if [ -n "$CONF_USER" ]; then NETDATA_USER=$(echo "$CONF_USER" | sed 's/^[^=]*=[ \t]*//' | sed 's/[ \t]*$//') fi |