test 2

ISSUE_TEMPLATE.md

@@ -1,12 +1,12 @@
 #### Expected Behavior
 
-<!-- what you expect to happen goes here -->
+(what you expect to happen goes here)
 
 -----
 
 #### Actual Behavior
 
-<!-- what actually happens goes here -->
+(what actually happens goes here)
 
 -----
 
@@ -30,5 +30,5 @@
 - Include what you've done so far in the installation, and if you got any error messages along the way.
 - Indicate whether or not you've manually edited any data directly.
 
-<!-- Please do not post an issue without answering the related questions above. If you have opened a different issue and already answered these questions, answer them again, once for every ticket. It will be next to impossible for us to help you. -->
+Please do not post an issue without answering the related questions above. If you have opened a different issue and already answered these questions, answer them again, once for every ticket. It will be next to impossible for us to help you.
 

Troubleshooting.md

@@ -32,18 +32,3 @@ This will check and continually update the last 50 log files for your XOCE insta
 
        journalctl -u xo-server -f -n 50
 
-# Required Dependencies 
-
-Your system must be able to install the following list of dependencies, usually this is automatic but some distributions might not have the required repositories. Plese confirm you can install these before creating a ticket. 
-
-Check your distribution respositories list ie: ```/etc/apt/sources.list``` for multiverse. 
-
-* build-essential 
-* redis-server 
-* libpng-dev 
-* git 
-* python-minimal 
-* libvhdi-utils 
-* nfs-common
-
-These dependencies (on Ubuntu) are available from the ```multiverse``` and ```universe``` repositories. 

_config.yml

@@ -1 +0,0 @@
-theme: jekyll-theme-slate

xo_install.sh

@@ -1,52 +1,32 @@
 #!/bin/bash
 
-# Check if we were effectively run as root
-[ $EUID = 0 ] || { echo "This script needs to be run as root!"; exit 1; }
-
-#Check for 1GB Memory
-totalk=$(awk '/^MemTotal:/{print $2}' /proc/meminfo)
-if [ "$totalk" -lt "1000000" ]; then echo "XOCE Requires at least 1GB Memory!"; exit 1; fi 
-
-distro=$(/usr/bin/lsb_release -is)
-if [ "$distro" = "Ubuntu" ]; then /usr/bin/add-apt-repository multiverse; fi
-
 xo_branch="master"
 xo_server="https://github.com/vatesfr/xen-orchestra"
 n_repo="https://raw.githubusercontent.com/visionmedia/n/master/bin/n"
 yarn_repo="deb https://dl.yarnpkg.com/debian/ stable main"
-node_source="https://deb.nodesource.com/setup_8.x"
+node_source="https://deb.nodesource.com/setup_9.x"
 yarn_gpg="https://dl.yarnpkg.com/debian/pubkey.gpg"
 n_location="/usr/local/bin/n"
 xo_server_dir="/opt/xen-orchestra"
 systemd_service_dir="/lib/systemd/system"
 xo_service="xo-server.service"
 
-#Ensure that git and curl are installed
-/usr/bin/apt-get update
-/usr/bin/apt-get --yes install git curl
-
 #Install node and yarn
 cd /opt
 
-/usr/bin/curl -sL $node_source | bash -
-/usr/bin/curl -sS $yarn_gpg | apt-key add -
-echo "$yarn_repo" | tee /etc/apt/sources.list.d/yarn.list
-/usr/bin/apt-get update
-/usr/bin/apt-get install --yes nodejs yarn
+/usr/bin/curl -sL $node_source | sudo -E bash -
+/usr/bin/curl -sS $yarn_gpg | sudo apt-key add -
+echo "$yarn_repo" | sudo tee /etc/apt/sources.list.d/yarn.list
+sudo /usr/bin/apt-get update
+sudo /usr/bin/apt-get install --yes nodejs yarn
 
 #Install n
 /usr/bin/curl -o $n_location $n_repo
-/bin/chmod +x $n_location
-/usr/local/bin/n lts
-
-#Symbolic Link
-ln -s /usr/bin/node /usr/local/bin/node
-
-#node_modules directory creation
-mkdir /usr/local/lib/node_modules/
+sudo /bin/chmod +x $n_location
+sudo /usr/local/bin/n stable
 
 #Install XO dependencies
-/usr/bin/apt-get install --yes build-essential redis-server libpng-dev git python-minimal libvhdi-utils nfs-common
+sudo /usr/bin/apt-get install --yes build-essential redis-server libpng-dev git python-minimal libvhdi-utils nfs-common
 
 /usr/bin/git clone -b $xo_branch $xo_server
 
@@ -58,13 +38,8 @@ cd $xo_server_dir
 /usr/bin/yarn build
 
 cd packages/xo-server
-cp sample.config.yaml .xo-server.yaml
-sed -i "s|#'/': '/path/to/xo-web/dist/'|'/': '/opt/xen-orchestra/packages/xo-web/dist'|" .xo-server.yaml
-
-# symlink all plugins
-for source in =$(ls -d /opt/xen-orchestra/packages/xo-server-*); do
-    ln -s "$source" /usr/local/lib/node_modules/
-done
+sudo cp sample.config.yaml .xo-server.yaml
+sudo sed -i "s|#'/': '/path/to/xo-web/dist/'|'/': '/opt/xen-orchestra/packages/xo-web/dist'|" .xo-server.yaml
 
 if [[ ! -e $systemd_service_dir/$xo_service ]] ; then
 
@@ -86,9 +61,9 @@ WantedBy=multi-user.target
 EOF
 fi
 
-/bin/systemctl daemon-reload
-/bin/systemctl enable $xo_service
-/bin/systemctl start $xo_service
+sudo /bin/chmod +x $systemd_service_dir/$xo_service
+sudo /bin/systemctl enable $xo_service
+sudo /bin/systemctl start $xo_service
 
 echo ""
 echo ""

xoce

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-XOCE_URL=https://drive.google.com/uc?export=download&confirm=ktXq&id=1eKz78LjkmrMHU95OC3qiQpPLuryJ2TEK
+XOCE_URL=https://drive.google.com/uc?export=download&confirm=p6Qh&id=1VH-eKwDWaW4t7XOgtbcJPMNP7CgFhj7f
 
 # Welcome message
 printf "\n\033[1mWelcome to the XOCE auto-deploy script!\033[0m\n\n"