diff --git a/README.md b/README.md index 004fbbe..017bd31 100644 --- a/README.md +++ b/README.md @@ -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. 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. Tool makes all necessary changes required for Xen-Orchestra to run (including packages, user creation, permissions). Please evaluate script if needed. diff --git a/docker/monit-services b/docker/monit-services index 3dfaf5a..65dc448 100644 --- a/docker/monit-services +++ b/docker/monit-services @@ -10,5 +10,5 @@ check process redis with pidfile /var/run/redis_6379.pid stop program = "/usr/bin/redis-cli shutdown" check process rpcbind - matching "rpcbind" - start program = "/usr/sbin/rpcbind" + matching "rpcbind" + start program = "/usr/sbin/rpcbind" diff --git a/tests/run-tests.sh b/tests/run-tests.sh index 48138ad..bc72ce7 100755 --- a/tests/run-tests.sh +++ b/tests/run-tests.sh @@ -18,24 +18,24 @@ function RunTestsSingle { curl -s -L 192.168.33.101 >> $LOGFILE 2>&1 || false if [[ $? == "1" ]]; then - echo "$1 install HTTP Check: failed" + echo "$1 install HTTP Check: failed" else echo "$1 install HTTP Check: success" fi sleep 5 vagrant provision --provision-with update >> $LOGFILE 2>&1 - sleep 5 - echo "" >> $LOGFILE - echo "Curl output after update:" >> $LOGFILE - curl -s -L 192.168.33.101 >> $LOGFILE 2>&1 || false + sleep 5 + echo "" >> $LOGFILE + echo "Curl output after update:" >> $LOGFILE + curl -s -L 192.168.33.101 >> $LOGFILE 2>&1 || false - if [[ $? == "1" ]]; then - echo "$1 update HTTP Check: failed" - else - echo "$1 update HTTP Check: success" - fi - sleep 5 + if [[ $? == "1" ]]; then + echo "$1 update HTTP Check: failed" + else + echo "$1 update HTTP Check: success" + fi + sleep 5 vagrant destroy -f >> $LOGFILE 2>&1 unset VAGRANT_CWD @@ -54,13 +54,13 @@ for x in CentOS Debian Ubuntu; do echo "Vagrant box failed to start, exiting" exit 1; fi - + vagrant provision --provision-with install >> $LOGFILE 2>&1 sleep 5 echo "" >> $LOGFILE echo "Curl output after install:" >> $LOGFILE curl -s -L -m 5 192.168.33.101 >> $LOGFILE 2>&1 || false - + if [[ $? == "1" ]]; then echo "$x install HTTP Check: failed" else diff --git a/xo-install.sh b/xo-install.sh index 716c2a7..5d02dd1 100755 --- a/xo-install.sh +++ b/xo-install.sh @@ -120,7 +120,7 @@ function InstallDependenciesDebian { trap ErrorHandling ERR INT # Install necessary dependencies for XO build - + echo echo -n "Running apt-get update..." apt-get update >/dev/null @@ -178,8 +178,8 @@ function InstallDependenciesDebian { echo "Enabling and starting redis service" /bin/systemctl enable redis-server >/dev/null && /bin/systemctl start redis-server >/dev/null - echo "Enabling and starting rpcbind service" - /bin/systemctl enable rpcbind >/dev/null && /bin/systemctl start rpcbind >/dev/null + echo "Enabling and starting rpcbind service" + /bin/systemctl enable rpcbind >/dev/null && /bin/systemctl start rpcbind >/dev/null } 2>$LOGFILE @@ -203,9 +203,9 @@ function UpdateNodeYarn { function InstallXOPlugins { set -e - + trap ErrorHandling ERR INT - + if [[ "$PLUGINS" ]] && [[ ! -z "$PLUGINS" ]]; then echo @@ -436,9 +436,9 @@ function HandleArgs { ;; esac -} +} -function RollBackInstallation { +function RollBackInstallation { INSTALLATIONS=($(find $INSTALLDIR/xo-builds/ -maxdepth 1 -type d -name "xen-orchestra-*")) @@ -643,7 +643,7 @@ read -p ": " option ;; 2) PullDockerImage - + ;; 3) exit 0