Update xoce-import.sh

Testing with another host

README.md

@@ -1,8 +1,27 @@
 # 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>
@@ -14,26 +33,35 @@ 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 option
+# 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)"
+    bash -c "$(curl -s https://raw.githubusercontent.com/Jarli01/xenorchestra_installer/master/xoce-import.sh)"
 
-SHA256 Checksum "0ae7e283518f9b12b9a3756c58fbf357aea852df062be842adbb45eb1e42dcec"
+MD5	Checksum `5db537c4b6388a4323583357b6e13d20`
+SHA256 Checksum `c487d63f2eef67fcaf0e9c4e4998d4a3948fdad960cb1af5a70fcb80b07c2551`
 
 For verification of SHA256 checksum the XVA file can be downloaded directly and verified/imported. 
-XVA Direct Download https://srv-file19.gofile.io/download/Kt6nJu/20200722T183158Z%20-%20XOCE.xva
+
+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. Alternatively a reverse proxy can be used for public facing installations.  
+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
+## 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
     

xoce-import.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-XOCE_URL=https://srv-file19.gofile.io/download/Kt6nJu/20200722T183158Z%20-%20XOCE.xva
+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