installer adds netdata user to the docker group to be able get docker names #308, installer checks the IP netdata should be listening to give proper information to the user #311
Costa Tsaousis (ktsaou) committed
Apr 29, 2016 at 03:48 UTC
03bd0f86d8b0fc546e523438bb71e1e2905a95fa
1 file changed
+50
-6
netdata-installer.sh
+50
-6
@@ -334,13 +334,40 @@ do
334
fi
335
done
336
337
+NETDATA_ADDED_TO_DOCKER=0
338
if [ ${UID} -eq 0 ]
339
then
339
- echo >&2 "Adding netdata user group ..."
340
- getent group netdata > /dev/null || run groupadd -r netdata
340
+ getent group netdata > /dev/null
341
+ if [ $? -ne 0 ]
342
+ then
343
+ echo >&2 "Adding netdata user group ..."
344
+ run groupadd -r netdata
345
+ fi
346
+
347
+ getent passwd netdata > /dev/null
348
+ if [ $? -ne 0 ]
349
+ then
350
+ echo >&2 "Adding netdata user account ..."
351
+ run useradd -r -g netdata -c netdata -s /sbin/nologin -d / netdata
352
+ fi
353
342
- echo >&2 "Adding netdata user account ..."
343
- getent passwd netdata > /dev/null || run useradd -r -g netdata -c netdata -s /sbin/nologin -d / netdata
354
+ getent group docker > /dev/null
355
+ if [ $? -eq 0 ]
356
+ then
357
+ # find the users in the docker group
358
+ docker=$(getent group docker | cut -d ':' -f 4)
359
+ if [[ ",${docker}," =~ ,netdata, ]]
360
+ then
361
+ # netdata is already there
362
+ :
363
+ else
364
+ # netdata is not in docker group
365
+ echo >&2 "Adding netdata user to the docker group (needed to get container names) ..."
366
+ run usermod -a -G docker netdata
367
+ fi
368
+ # let the uninstall script know
369
+ NETDATA_ADDED_TO_DOCKER=1
370
+ fi
371
fi
372
373
@@ -384,6 +411,7 @@ NETDATA_CACHE_DIR="$( config_option "cache directory" "${NETDATA_PREFIX}/var/cac
411
NETDATA_WEB_DIR="$( config_option "web files directory" "${NETDATA_PREFIX}/usr/share/netdata/web" )"
412
NETDATA_LOG_DIR="$( config_option "log directory" "${NETDATA_PREFIX}/var/log/netdata" )"
413
NETDATA_CONF_DIR="$( config_option "config directory" "${NETDATA_PREFIX}/etc/netdata" )"
414
+NETDATA_BIND="$( config_option "bind socket to IP" "*" )"
415
NETDATA_RUN_DIR="${NETDATA_PREFIX}/var/run"
416
417
@@ -710,22 +738,38 @@ if [ $? -eq 0 ]
738
echo " groupdel netdata"
739
fi
740
741
+getent group docker > /dev/null
742
+if [ $? -eq 0 -a "${NETDATA_ADDED_TO_DOCKER}" = "1" ]
743
+ then
744
+ echo
745
+ echo "You may also want to remove the netdata user from the docker group"
746
+ echo "by running:"
747
+ echo " gpasswd -d netdata docker"
748
+fi
749
+
750
UNINSTALL
751
chmod 750 netdata-uninstaller.sh
752
753
# -----------------------------------------------------------------------------
754
755
+if [ "${NETDATA_BIND}" = "*" ]
756
+ then
757
+ access="localhost"
758
+else
759
+ access="${NETDATA_BIND}"
760
+fi
761
+
762
cat <<END
763
764
765
-------------------------------------------------------------------------------
766
723
-OK. NetData is installed and it is running.
767
+OK. NetData is installed and it is running (listening to ${NETDATA_BIND}:${NETDATA_PORT}).
768
769
-------------------------------------------------------------------------------
770
771
728
-Hit http://localhost:${NETDATA_PORT}/ from your browser.
772
+Hit http://${access}:${NETDATA_PORT}/ from your browser.
773
774
To stop netdata, just kill it, with:
775