make sure netdata group will never be empty
Costa Tsaousis (ktsaou) committed
Jan 20, 2018 at 19:12 UTC
7b03cb85299d3f2ec3d0f28dcccfb9ed89bdfc08
1 file changed
+26
-1
netdata-installer.sh
+26
-1
@@ -687,7 +687,11 @@ fi
687
688
# the owners of the web files
689
NETDATA_WEB_USER="$( config_option "web" "web files owner" "${NETDATA_USER}" )"
690
-[ "${UID}" = "0" -a "${NETDATA_USER}" != "${NETDATA_WEB_USER}" ] && NETDATA_GROUP="${NETDATA_WEB_USER}"
690
+if [ "${UID}" = "0" -a "${NETDATA_USER}" != "${NETDATA_WEB_USER}" ]
691
+then
692
+ NETDATA_GROUP="$(id -g -n ${NETDATA_WEB_USER})"
693
+ [ -z "${NETDATA_GROUP}" ] && NETDATA_GROUP="${NETDATA_WEB_USER}"
694
+fi
695
NETDATA_WEB_GROUP="$( config_option "web" "web files group" "${NETDATA_GROUP}" )"
696
697
# port
@@ -702,6 +706,27 @@ NETDATA_LOG_DIR="$( config_option "global" "log directory" "${NETDATA_PREFIX}/va
706
NETDATA_CONF_DIR="$( config_option "global" "config directory" "${NETDATA_PREFIX}/etc/netdata" )"
707
NETDATA_RUN_DIR="${NETDATA_PREFIX}/var/run"
708
709
+cat <<OPTIONSEOF
710
+
711
+ Permissions
712
+ - netdata user : ${NETDATA_USER}
713
+ - netdata group : ${NETDATA_GROUP}
714
+ - web files user : ${NETDATA_WEB_USER}
715
+ - web files group : ${NETDATA_WEB_GROUP}
716
+ - root user : ${ROOT_USER}
717
+
718
+ Directories
719
+ - netdata conf dir : ${NETDATA_CONF_DIR}
720
+ - netdata log dir : ${NETDATA_LOG_DIR}
721
+ - netdata run dir : ${NETDATA_RUN_DIR}
722
+ - netdata lib dir : ${NETDATA_LIB_DIR}
723
+ - netdata web dir : ${NETDATA_WEB_DIR}
724
+ - netdata cache dir: ${NETDATA_CACHE_DIR}
725
+
726
+ Other
727
+ - netdata port : ${NETDATA_PORT}
728
+
729
+OPTIONSEOF
730
731
# -----------------------------------------------------------------------------
732
progress "Fix permissions of netdata directories (using user '${NETDATA_USER}')"