fix indentations, change the way systemd service file is activated so that enabling works correctly
This commit is contained in:
@@ -29,7 +29,7 @@ LOGFILE="$(dirname $0)/xo-install.log"
|
||||
# NodeJS and Yarn are automatically updated when running update. Switch this option to false if you want to disable it.
|
||||
AUTOUPDATE="true"
|
||||
|
||||
# Define the number of previous installations you want to keep
|
||||
# Define the number of previous installations you want to keep. Needs to be at least 1
|
||||
PRESERVE="3"
|
||||
|
||||
### End of editable variables ###
|
||||
@@ -237,10 +237,10 @@ function InstallXO {
|
||||
InstallXOPlugins
|
||||
|
||||
echo
|
||||
echo "Fixing binary path in systemd service configuration and symlinking to /etc/systemd/system/xo-server.service"
|
||||
echo "Fixing binary path in systemd service configuration file"
|
||||
sed -i "s#ExecStart=.*#ExecStart=$INSTALLDIR\/xo-server\/bin\/xo-server#" $INSTALLDIR/xo-builds/xen-orchestra-$TIME/packages/xo-server/xo-server.service
|
||||
echo
|
||||
echo "Adding WorkingDirectory parameter to systemd service configuration"
|
||||
echo "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
|
||||
@@ -289,8 +289,8 @@ function InstallXO {
|
||||
fi
|
||||
|
||||
echo
|
||||
echo "Symlinking systemd service configuration"
|
||||
ln -sfn $INSTALLDIR/xo-server/xo-server.service /etc/systemd/system/xo-server.service
|
||||
echo "Replacing systemd service configuration file"
|
||||
/bin/cp -f $INSTALLDIR/xo-builds/xen-orchestra-$TIME/packages/xo-server/xo-server.service /etc/systemd/system/xo-server.service
|
||||
sleep 2
|
||||
echo "Reloading systemd configuration"
|
||||
echo
|
||||
@@ -335,11 +335,16 @@ function UpdateXO {
|
||||
|
||||
InstallXO
|
||||
|
||||
if [[ "$PRESERVE" != "0" ]]; then
|
||||
|
||||
# remove old builds. leave as many as defined in PRESERVE variable
|
||||
echo
|
||||
echo -n "Removing old installations (leaving $PRESERVE latest)..."
|
||||
find $INSTALLDIR/xo-builds/ -maxdepth 1 -type d -name "xen-orchestra*" -printf "%T@ %p\n" | sort -n | cut -d' ' -f2- | head -n -$PRESERVE | xargs -r rm -r
|
||||
echo "done"
|
||||
else
|
||||
echo "PRESERVE variable is set to 0. This needs to be at least 1. Not doing a cleanup"
|
||||
fi
|
||||
|
||||
} 2>$LOGFILE
|
||||
|
||||
@@ -393,8 +398,8 @@ function RollBackInstallation {
|
||||
echo "Setting $INSTALLDIR/xo-web symlink to $INSTALLATION/packages/xo-web"
|
||||
ln -sfn $INSTALLATION/packages/xo-web $INSTALLDIR/xo-web
|
||||
echo
|
||||
echo "Updating xo-server.service systemd configuration file location"
|
||||
ln -sfn $INSTALLDIR/xo-server/xo-server.service /etc/systemd/system/xo-server.service
|
||||
echo "Replacing xo.server.service systemd configuration file"
|
||||
/bin/cp -f $INSTALLATION/packages/xo-server/xo-server.service /etc/systemd/system/xo-server.service
|
||||
/bin/systemctl daemon-reload
|
||||
echo
|
||||
echo "Restarting xo-server..."
|
||||
|
Reference in New Issue
Block a user