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

Fixed whitespace issues.

Browse Source
This commit is contained in:
Tynan McAuley
2018-11-05 17:01:51 -05:00
parent 6b34d96e74
commit afdd9f1c77
4 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -84,7 +84,7 @@ Tool has been tested to work with following distros:
In order to use file level restore from delta backups, the service needs to be ran as root. In order to use file level restore from delta backups, the service needs to be ran as root.
CentOS installation is currently not able to do file level restore if the backed up disk contains LVM. CentOS installation is currently not able to do file level restore if the backed up disk contains LVM.
CentOS setup is confirmed to work with fresh minimal installation and SELinux enabled. CentOS setup is confirmed to work with fresh minimal installation and SELinux enabled.
Although script doesn't do any SELinux checks or modifications, so you need to take care of possible changes by yourself according to your system. Although script doesn't do any SELinux checks or modifications, so you need to take care of possible changes by yourself according to your system.
Tool makes all necessary changes required for Xen-Orchestra to run (including packages, user creation, permissions). Please evaluate script if needed. Tool makes all necessary changes required for Xen-Orchestra to run (including packages, user creation, permissions). Please evaluate script if needed.

4
docker/monit-services
View File

@@ -10,5 +10,5 @@ check process redis with pidfile /var/run/redis_6379.pid
stop program = "/usr/bin/redis-cli shutdown" stop program = "/usr/bin/redis-cli shutdown"
check process rpcbind check process rpcbind
matching "rpcbind" matching "rpcbind"
start program = "/usr/sbin/rpcbind" start program = "/usr/sbin/rpcbind"

26
tests/run-tests.sh
View File

@@ -18,24 +18,24 @@ function RunTestsSingle {
curl -s -L 192.168.33.101 >> $LOGFILE 2>&1 || false curl -s -L 192.168.33.101 >> $LOGFILE 2>&1 || false
if [[ $? == "1" ]]; then if [[ $? == "1" ]]; then
echo "$1 install HTTP Check: failed" echo "$1 install HTTP Check: failed"
else else
echo "$1 install HTTP Check: success" echo "$1 install HTTP Check: success"
fi fi
sleep 5 sleep 5
vagrant provision --provision-with update >> $LOGFILE 2>&1 vagrant provision --provision-with update >> $LOGFILE 2>&1
sleep 5 sleep 5
echo "" >> $LOGFILE echo "" >> $LOGFILE
echo "Curl output after update:" >> $LOGFILE echo "Curl output after update:" >> $LOGFILE
curl -s -L 192.168.33.101 >> $LOGFILE 2>&1 || false curl -s -L 192.168.33.101 >> $LOGFILE 2>&1 || false
if [[ $? == "1" ]]; then if [[ $? == "1" ]]; then
echo "$1 update HTTP Check: failed" echo "$1 update HTTP Check: failed"
else else
echo "$1 update HTTP Check: success" echo "$1 update HTTP Check: success"
fi fi
sleep 5 sleep 5
vagrant destroy -f >> $LOGFILE 2>&1 vagrant destroy -f >> $LOGFILE 2>&1
unset VAGRANT_CWD unset VAGRANT_CWD
@@ -54,13 +54,13 @@ for x in CentOS Debian Ubuntu; do
echo "Vagrant box failed to start, exiting" echo "Vagrant box failed to start, exiting"
exit 1; exit 1;
fi fi
vagrant provision --provision-with install >> $LOGFILE 2>&1 vagrant provision --provision-with install >> $LOGFILE 2>&1
sleep 5 sleep 5
echo "" >> $LOGFILE echo "" >> $LOGFILE
echo "Curl output after install:" >> $LOGFILE echo "Curl output after install:" >> $LOGFILE
curl -s -L -m 5 192.168.33.101 >> $LOGFILE 2>&1 || false curl -s -L -m 5 192.168.33.101 >> $LOGFILE 2>&1 || false
if [[ $? == "1" ]]; then if [[ $? == "1" ]]; then
echo "$x install HTTP Check: failed" echo "$x install HTTP Check: failed"
else else

16
xo-install.sh
View File

@@ -120,7 +120,7 @@ function InstallDependenciesDebian {
trap ErrorHandling ERR INT trap ErrorHandling ERR INT
# Install necessary dependencies for XO build # Install necessary dependencies for XO build
echo echo
echo -n "Running apt-get update..." echo -n "Running apt-get update..."
apt-get update >/dev/null apt-get update >/dev/null
@@ -178,8 +178,8 @@ function InstallDependenciesDebian {
echo "Enabling and starting redis service" echo "Enabling and starting redis service"
/bin/systemctl enable redis-server >/dev/null && /bin/systemctl start redis-server >/dev/null /bin/systemctl enable redis-server >/dev/null && /bin/systemctl start redis-server >/dev/null
echo "Enabling and starting rpcbind service" echo "Enabling and starting rpcbind service"
/bin/systemctl enable rpcbind >/dev/null && /bin/systemctl start rpcbind >/dev/null /bin/systemctl enable rpcbind >/dev/null && /bin/systemctl start rpcbind >/dev/null
} 2>$LOGFILE } 2>$LOGFILE
@@ -203,9 +203,9 @@ function UpdateNodeYarn {
function InstallXOPlugins { function InstallXOPlugins {
set -e set -e
trap ErrorHandling ERR INT trap ErrorHandling ERR INT
if [[ "$PLUGINS" ]] && [[ ! -z "$PLUGINS" ]]; then if [[ "$PLUGINS" ]] && [[ ! -z "$PLUGINS" ]]; then
echo echo
@@ -436,9 +436,9 @@ function HandleArgs {
;; ;;
esac esac
} }
function RollBackInstallation { function RollBackInstallation {
INSTALLATIONS=($(find $INSTALLDIR/xo-builds/ -maxdepth 1 -type d -name "xen-orchestra-*")) INSTALLATIONS=($(find $INSTALLDIR/xo-builds/ -maxdepth 1 -type d -name "xen-orchestra-*"))
@@ -643,7 +643,7 @@ read -p ": " option
;; ;;
2) 2)
PullDockerImage PullDockerImage
;; ;;
3) 3)
exit 0 exit 0