Update xoce-import.sh

Testing with another host

README.md

@@ -1,23 +1,86 @@
 # Xen-Orchestra (Community Edition) Installer
 
-Xen-Orchestra (Community Edition) allows you to administer Citrix XenServer and XCP-ng as well as backup any VM's running on these systems. 
+Xen-Orchestra (Community Edition) allows you to administer Citrix Hypervisor (aka XenServer) and XCP-ng as well as backup any VM's running on these systems. The single line installation script allows you to go from a bare-minimal installation of [Ubuntu](https://ubuntu.com/download/server) or [Debian (Server)](https://www.debian.org/distrib/netinst) to fully operational XOCE server.
 
-The single line installation script allows you to go from a bare-minimal installation of [Ubuntu](https://ubuntu.com/download/server) or [Debian (Server)](https://www.debian.org/distrib/netinst) to fully operational XOCE server. Run the following steps from a root shell.
+## System Minimum Requirements for installation
+
+* 1 vCPU
+* 3 GiB RAM
+* 10 GiB disk space
+
+## System recommendations for operation
+
+* 2 vCPU recommended 
+* 3 GiB of RAM (for environments containing 500+ VMs increase the amount RAM)
+* 20 GiB disk space (for system updates)
+
+## Assumptions
+
+* We assume you have a Virtual or physical server running a currently supported Ubuntu or Debian server installation with internet connectivity
+* You've read this community and understand what installation entails and does on your soon to be XOCE server
+
+## Installation
+ 
+Run the following steps from a root shell on your **Ubuntu or Debian** host.
 
     curl https://raw.githubusercontent.com/Jarli01/xenorchestra_installer/master/xo_install.sh | sudo bash
     <password>
     
 The default username and password are applied, admin@admin.net and admin for the password
-    
+
 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
 
-# Declaration
+# Declarations
 
 This script automates the manual process which can be [found here](https://xen-orchestra.com/docs/from_the_sources.html) as well as removes a few feature restrictions that otherwise would need to be changed manually if following the manual installation process. This script is not officially supported by the Vates team, but is supported by this community. 
 
+# Prepacked installation
+* *This is a very small installation and while it will operate, it may not meet all of your requirements, use at your own discretion* 
+
+To download and deploy a prepacked Ubuntu 20.04 installation of Xen Orchestra (CE) run the below from an SSH session on your XCP-NG/Citrix Hypervisor (XenServer) host(s)
+
+    bash -c "$(curl -s https://raw.githubusercontent.com/Jarli01/xenorchestra_installer/master/xoce-import.sh)"
+
+MD5	Checksum `5db537c4b6388a4323583357b6e13d20`
+SHA256 Checksum `c487d63f2eef67fcaf0e9c4e4998d4a3948fdad960cb1af5a70fcb80b07c2551`
+
+For verification of SHA256 checksum the XVA file can be downloaded directly and verified/imported. 
+
+Direct Download https://srv-file8.gofile.io/download/CYaI0l/XOCE.xva
+
+To login to the console use:
+Username: **XOCE**
+Password: **XOCE**
+
+**Change the password if you are using this in production**
+
+# Self-signed SSL 
+
+If you are running this internally and need SSL (recommended) follow the below steps to create a self-signed SSL key and certificate; while browsers will still say the connection is unsecured, this is because the certificate isn't from a public authority and is on your LAN. You can add this cert to your systems root authority if it want to to remove the warning. Alternatively a reverse proxy can be used for public facing installations.  
+
+## Generate your key and cert from your XOCE installation
+
+    sudo openssl req -x509 -nodes -days 3650 -newkey rsa:4096 -keyout /etc/ssl/private/key.pem -out /etc/ssl/certs/certificate.pem
+    
+Now edit the xo-server.toml file
+
+    vi /opt/xen-orchestra/packages/xo-server/.xo-server.toml
+    
+Comment-out or edit the port from 80 to 443 and add the cert and key to the appropriate locations within this file.
+    
+    port = 443
+    cert = '/etc/ssl/certs/certificate.pem'
+    key = '/etc/ssl/private/key.pem'
+    
+Restart xo-server.service
+
+    systemctl restart xo-server.service
+
+Reload your XOCE website using SSL (https://your-host-ip)
+
 # Problems?
 
 Check out our [Troubleshooting Page](https://github.com/Jarli01/xenorchestra_installer/blob/master/TROUBLESHOOTING.md)!

TROUBLESHOOTING.md

@@ -6,7 +6,7 @@ If you are having problems, before you create an issue, please check the followi
 
 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/).
+Xen-Orchestra (VatesFR) 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://xcp-ng.org/forum/category/12/xen-orchestra).
 
 Please use the [ISSUE TEMPLATE](https://github.com/Jarli01/xenorchestra_installer/issues/new) when submitting an issue.
 

xo_install.sh

@@ -43,7 +43,7 @@ n lts
 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 python3-minimal libvhdi-utils nfs-common lvm2 cifs-utils
+/usr/bin/apt-get install --yes build-essential redis-server libpng-dev git python2-minimal libvhdi-utils nfs-common lvm2 cifs-utils
 
 /usr/bin/git clone -b $xo_branch $xo_server
 

xoce-import.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-XOCE_URL=https://archive.org/download/xogithub_gmail_Xoce/xoce
+XOCE_URL=https://cloud.wellston.biz/index.php/s/54tPkkkTcxQPnDs/download
 
 # Welcome message
 printf "\n\033[1mWelcome to the XOCE auto-deploy script!\033[0m\n\n"
@@ -49,7 +49,7 @@ uuid=$(xe vm-import url="$XOCE_URL" 2> /dev/null)
 import=$?
 if [ $import -ne 0 ]
 then
-  uuid=$(curl "$XOCE_URL" | xe vm-import filename=/dev/stdin 2>&1)
+  uuid=$(curl "$XOCE_URL" -L -O -c - --keepalive-time 5 | xe vm-import filename=/dev/stdin 2>&1)
 fi
 
 # If it fails again (for any reason), we stop the script