From 8361b047e87d820ea5de824a3458ce48b75bd178 Mon Sep 17 00:00:00 2001 From: ronivay Date: Fri, 13 Mar 2020 12:14:15 +0200 Subject: [PATCH] Only run cap_net_bind_service when user is set to not root and fix stdout msg --- xo-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xo-install.sh b/xo-install.sh index cb708ec..539d2e5 100755 --- a/xo-install.sh +++ b/xo-install.sh @@ -396,7 +396,7 @@ function InstallXO { echo -e "${INFO} Adding WorkingDirectory parameter to systemd service configuration file" sed -i "/ExecStart=.*/a WorkingDirectory=$INSTALLDIR/xo-server" $INSTALLDIR/xo-builds/xen-orchestra-$TIME/packages/xo-server/xo-server.service - if [ $XOUSER ]; then + if [[ "$XOUSER" != "root" ]]; then echo -e "${INFO} Adding user to systemd config" sed -i "/SyslogIdentifier=.*/a User=$XOUSER" $INSTALLDIR/xo-builds/xen-orchestra-$TIME/packages/xo-server/xo-server.service @@ -407,7 +407,7 @@ function InstallXO { fi if [[ ! -z $NODEBINARY ]]; then - echo -ne "${INFO} Attempting to set cap_net_bind_service permission for $NODEBINARY" + echo -ne "${PROGRESS} Attempting to set cap_net_bind_service permission for $NODEBINARY" setcap 'cap_net_bind_service=+ep' $NODEBINARY >/dev/null \ && echo -e "\r${OK} Attempting to set cap_net_bind_service permission for $NODEBINARY" || { echo -e "\r${FAIL} Attempting to set cap_net_bind_service permission for $NODEBINARY" ; echo " Non-privileged user might not be able to bind to <1024 port. xo-server won't start most likely" ; } else