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

@@ -28,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

@@ -2,8 +2,6 @@ If you are having issues before you create an issue please check the following.
 
 # XO Website not loading
 
-If the XO website fails to load please run the below command to determine if the primary service is running. 
-
        systemctl status xo-server.service
        
  A properly running system should look similar to this:
@@ -47,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

@@ -3,7 +3,7 @@
 # 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
+#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 
 
@@ -21,7 +21,7 @@ xo_server_dir="/opt/xen-orchestra"
 systemd_service_dir="/lib/systemd/system"
 xo_service="xo-server.service"
 
-# Ensure that git and curl are installed
+#Ensure that git and curl are installed
 /usr/bin/apt-get update
 /usr/bin/apt-get --yes install git curl
 
@@ -34,25 +34,22 @@ echo "$yarn_repo" | tee /etc/apt/sources.list.d/yarn.list
 /usr/bin/apt-get update
 /usr/bin/apt-get install --yes nodejs yarn
 
-# Install n
+#Install n
 /usr/bin/curl -o $n_location $n_repo
 /bin/chmod +x $n_location
+/usr/local/bin/n lts
 
-# Symlink node directories
+#Symbolic Link
 ln -s /usr/bin/node /usr/local/bin/node
 
-# 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
+#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
 
 /usr/bin/git clone -b $xo_branch $xo_server
 
-# Removing the "Built from Source - no support banner
-sed -i '225,235 d' /opt/xen-orchestra/packages/xo-web/src/xo-app/index.js
-
-# Point people to this GH for issues first and we can escalte to vatesfr if so required
-
-sed -i 's~https://github.com/vatesfr/xen-orchestra/issues/new~https://github.com/Jarli01/xenorchestra_installer/issues/new~g' /opt/xen-orchestra/packages/xo-web/src/xo-app/about/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
 
@@ -61,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"