Update xo_install.sh

CONTRIBUTING.md

@@ -71,7 +71,7 @@ further defined and clarified by project maintainers.
 ### Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at xogithub@gmail.com. All
+reported by contacting the project team at [INSERT EMAIL ADDRESS]. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

README.md

@@ -16,10 +16,6 @@ If you don't want NFS capabilities run ```sudo apt-get remove nfs-common```.
 * Do not use LAMP
 * SSH Access is optional, but highly recommended
 
-# Problems?
-
-Check out our [Troubleshooting Page](https://github.com/Jarli01/xenorchestra_installer/blob/master/TROUBLESHOOTING.md)!
-
 # Goals/Backstory for this script
 
 I'm often asked "why can't this be run on CentOS or Fedora" to which my only reply is and has ever been: The goal was to be the XCP-ng of XS. Which means I wanted a solution that offered as much as XOA offers, while using what is available freely and from open sources. Without restrictions. 
@@ -32,6 +28,3 @@ That goal transformed into the desire to assist the developers of XOA by using a
 
 While the goal initially was to have a solution as close to XOA as possible, with the script came the ability and goal to automate the installation. This is a big deal for these scripts today, while providing an as near-match solution to XOA as possible. 
 
-To keep XOCE up to date I recommend that anyone who's used this installation script or the sources installation to use this: https://github.com/Jarli01/xenorchestra_updater
-
-

Troubleshooting.md

@@ -1,18 +1,6 @@
-# Troubleshooting
+If you are having issues before you create an issue please check the following. (We'll be asking you to look at and provide this information anyways)
 
-If you are having problems, before you create an issue, please check the following. (You will be asked to provide this information anyways)
-
-## Submitting a Support Request
-
-Any issues, questions, or bugs during installation and usage of this script, that can not be solved by the steps below, should **first** be addressed in *this repository.* 
-
-Xen-Orchestra (Community Edition) is not obligated to support scripted (or manual) builds. Please give us the ability to first troubleshoot the issue and/or verify this script is not the culprit before moving on to posting in the Xen-Orchestra [Community Forums](https://xen-orchestra.com/forum/).
-
-Please use the [ISSUE TEMPLATE](https://github.com/Jarli01/xenorchestra_installer/issues/new) when submitting an issue.
-
-## XO Website not loading
-
-If the XO website fails to load please run the below command to determine if the primary service is running. 
+# XO Website not loading
 
        systemctl status xo-server.service
        
@@ -29,7 +17,7 @@ If the XO website fails to load please run the below command to determine if the
 	   CGroup: /system.slice/xo-server.service
 			   └─710 /usr/local/bin/node ./bin/xo-server
        
-## XO not updating or you're stuck on a specific version.     
+# XO not updating or you're stuck on a specific version.     
        
 If you ever get stuck on a specific revision of XO, or are receiving an alert saying "Please tell us who you are" from git you need to run the below:
 
@@ -38,13 +26,13 @@ If you ever get stuck on a specific revision of XO, or are receiving an alert sa
       
 Provide your name and email address in the quoted sections, without quotes and once done try updating again. 
 
-## Checking the logs
+# Checking the logs
 
 This will check and continually update the last 50 log files for your XOCE installation and thus is subject to any specific issues you're encountering. Just keep this command at the ready to check on things if you need too. 
 
        journalctl -u xo-server -f -n 50
 
-## Required Dependencies 
+# 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. 
 
@@ -57,15 +45,5 @@ Check your distribution respositories list ie: ```/etc/apt/sources.list``` for m
 * python-minimal 
 * libvhdi-utils 
 * nfs-common
-* lvm2
-* cifs-utils
 
 These dependencies (on Ubuntu) are available from the ```multiverse``` and ```universe``` repositories. 
-
-## System Performance or General Errors Guidance
-
-While XOCE can and does operate without issue for many people there are benefits to using using more than the absolute minimum system specifications for the guest OS. 
-
-There is a mandate for 1 GB of ram built into the installation script. While this is a requirement of XO it isn't a requirement of the OS. 
-
-An additional check is being considered to match the XOA system which is supplied with 2 CPU (or 1 CPU with 2 cores). While this currently isn't implemented; if you encounter issues please try adding an additional CPU to your installation and see if the issue persists. 

xo_install.sh

@@ -14,43 +14,42 @@ 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"
 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"
 
-# Ensures that Yarn dependencies are installed, git, curl, apt-transport-https
+#Ensure that git and curl are installed
 /usr/bin/apt-get update
-/usr/bin/apt-get --yes install git curl apt-transport-https
+/usr/bin/apt-get --yes install git curl
 
-#Install yarn
+#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 yarn
+/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
 
-# Install node via n
-n 8.16
-
-# Symlink node directories
+#Symbolic Link
 ln -s /usr/bin/node /usr/local/bin/node
 
+#node_modules directory creation
+mkdir /usr/local/lib/node_modules/
+
 #Install XO dependencies
-/usr/bin/apt-get install --yes build-essential redis-server libpng-dev git python-minimal libvhdi-utils nfs-common lvm2 cifs-utils 
+/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
 
-# Disabling the "Built from Source Banner - No Support" Bar across the top of screen 
-sed -i 's/process.env.XOA_PLAN === 5/process.env.XOA_PLAN === 6/g' /opt/xen-orchestra/packages/xo-web/src/xo-app/index.js
-
 # Patch to allow config restore
 sed -i 's/< 5/> 0/g' /opt/xen-orchestra/packages/xo-web/src/xo-app/settings/config/index.js
 
@@ -59,21 +58,18 @@ cd $xo_server_dir
 /usr/bin/yarn build
 
 cd packages/xo-server
-cp sample.config.toml .xo-server.toml
-sed -i "s|#'/' = '/path/to/xo-web/dist/'|'/' = '/opt/xen-orchestra/packages/xo-web/dist'|" .xo-server.toml
+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
 
-#Create node_modules directory if doesn't exist
-mkdir -p /usr/local/lib/node_modules/
-
-# Symlink all plugins
-for source in $(ls -d /opt/xen-orchestra/packages/xo-server-*); do
+# symlink all plugins
+for source in =$(ls -d /opt/xen-orchestra/packages/xo-server-*); do
     ln -s "$source" /usr/local/lib/node_modules/
 done
 
 if [[ ! -e $systemd_service_dir/$xo_service ]] ; then
 
 /bin/cat << EOF >> $systemd_service_dir/$xo_service
-# Systemd service for XO-Server.
+# systemd service for XO-Server.
 
 [Unit]
 Description= XO Server

xoce

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