mirror/XenOrchestraInstallerUpdater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change final outputs depending on update/install task

Browse Source
This commit is contained in:
ronivay
2020-11-11 09:36:36 +02:00
parent f84f38f3d2
commit 9f2175aaaa
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
xo-install.sh
View File

@@ -545,7 +545,10 @@ function InstallXO {
# If this isn't a fresh install, then list the upgrade the user is making. # If this isn't a fresh install, then list the upgrade the user is making.
if [[ -n "$OLD_REPO_HASH" ]]; then if [[ -n "$OLD_REPO_HASH" ]]; then
echo echo
TASK="Update"
printinfo "Updating xen-orchestra from '$OLD_REPO_HASH_SHORT' to '$NEW_REPO_HASH_SHORT'" printinfo "Updating xen-orchestra from '$OLD_REPO_HASH_SHORT' to '$NEW_REPO_HASH_SHORT'"
else
TASK="Installation"
fi fi
echo echo
@@ -688,15 +691,21 @@ function InstallXO {
if [[ $(journalctl -u xo-server | sed -n 'H; /Starting XO Server/h; ${g;p;}' | grep "https\{0,1\}:\/\/\[::\]:$PORT") ]]; then if [[ $(journalctl -u xo-server | sed -n 'H; /Starting XO Server/h; ${g;p;}' | grep "https\{0,1\}:\/\/\[::\]:$PORT") ]]; then
echo echo
echo -e " ${COLOR_GREEN}WebUI started in port $PORT. Make sure you have firewall rules in place to allow access.${COLOR_N}" echo -e " ${COLOR_GREEN}WebUI started in port $PORT. Make sure you have firewall rules in place to allow access.${COLOR_N}"
if [[ "$TASK" == "Installation" ]]; then
echo -e " ${COLOR_GREEN}Default username: admin@admin.net password: admin${COLOR_N}" echo -e " ${COLOR_GREEN}Default username: admin@admin.net password: admin${COLOR_N}"
fi
echo echo
printinfo "Installation successful. Enabling xo-server service to start on reboot" printinfo "$TASK successful. Enabling xo-server service to start on reboot"
echo "" >> $LOGFILE
echo "$TASK succesful" >> $LOGFILE
cmdlog "/bin/systemctl enable xo-server" cmdlog "/bin/systemctl enable xo-server"
echo echo
/bin/systemctl enable xo-server >>$LOGFILE 2>&1 /bin/systemctl enable xo-server >>$LOGFILE 2>&1
else else
echo echo
printfail "Installation completed, but looks like there was a problem when starting xo-server/reading journalctl. Please see logs for more details" printfail "$TASK completed, but looks like there was a problem when starting xo-server/reading journalctl. Please see logs for more details"
echo "" >> $LOGFILE
echo "$TASK failed" >> $LOGFILE
echo "xo-server service log:" >> $LOGFILE echo "xo-server service log:" >> $LOGFILE
echo "" >> $LOGFILE echo "" >> $LOGFILE
journalctl -u xo-server -n 100 >> $LOGFILE journalctl -u xo-server -n 100 >> $LOGFILE