From 4157c9cde45211cb52158fa6a51313c757512df2 Mon Sep 17 00:00:00 2001 From: Jarli01 Date: Wed, 7 Feb 2018 09:46:18 -0500 Subject: [PATCH 01/10] Update xo_install.sh --- xo_install.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/xo_install.sh b/xo_install.sh index c08540b..95307cf 100644 --- a/xo_install.sh +++ b/xo_install.sh @@ -2,14 +2,13 @@ xo_branch="master" xo_server="https://github.com/vatesfr/xen-orchestra" -xo_web="https://github.com/vatesfr/xo-web" 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_9.x" yarn_gpg="https://dl.yarnpkg.com/debian/pubkey.gpg" n_location="/usr/local/bin/n" xo_server_dir="/opt/xen-orchestra" -xo_web_dir="/opt/xo-web" +xo_web_dir="/opt/xo-xen-orchestra" systemd_service_dir="/lib/systemd/system" xo_service="xo-server.service" @@ -30,18 +29,17 @@ sudo /usr/local/bin/n stable #Install XO dependencies 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 -/usr/bin/git clone -b $xo_branch $xo_web +/usr/bin/git/clone -b $xo_server # Patch to allow config restore -sed -i 's/< 5/> 0/g' /opt/xo-web/src/xo-app/settings/config/index.js +sed -i 's/< 5/> 0/g' ../xo-web/dist/src/xo-app/settings/config/index.js cd $xo_server_dir /usr/bin/yarn /usr/bin/yarn build cd packages/xo-server sudo cp sample.config.yaml .xo-server.yaml -sudo sed -i "s|#'/': '/path/to/xo-web/dist/'|'/': '/opt/xo-web/dist'|" .xo-server.yaml +sudo sed -i "s|#'/': '/path/to/xo-web/dist/'|'/': '/opt/xen-orchestra/packages/xo-web/dist'|" .xo-server.yaml cd $xo_web_dir /usr/bin/yarn From c1e58d98a04cc1299970f876a49ce3ce8a1784fe Mon Sep 17 00:00:00 2001 From: Jarli01 Date: Wed, 7 Feb 2018 10:00:45 -0500 Subject: [PATCH 02/10] Update xo_install.sh fixes to a few things - relative path etc. --- xo_install.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/xo_install.sh b/xo_install.sh index 95307cf..c28308d 100644 --- a/xo_install.sh +++ b/xo_install.sh @@ -8,7 +8,6 @@ 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" -xo_web_dir="/opt/xo-xen-orchestra" systemd_service_dir="/lib/systemd/system" xo_service="xo-server.service" @@ -32,12 +31,10 @@ sudo /usr/bin/apt-get install --yes build-essential redis-server libpng-dev git /usr/bin/git/clone -b $xo_server # Patch to allow config restore -sed -i 's/< 5/> 0/g' ../xo-web/dist/src/xo-app/settings/config/index.js +sed -i 's/< 5/> 0/g' /opt/xen-orchestra/xo-web/dist/src/xo-app/settings/config/index.js -cd $xo_server_dir -/usr/bin/yarn -/usr/bin/yarn build cd packages/xo-server + 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 cd $xo_web_dir From 5d84edb8e2808333572dc64723f78535e660c5cc Mon Sep 17 00:00:00 2001 From: Jarli01 Date: Wed, 7 Feb 2018 10:07:51 -0500 Subject: [PATCH 03/10] Update xo_install.sh more fixes --- xo_install.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/xo_install.sh b/xo_install.sh index c28308d..c2881c0 100644 --- a/xo_install.sh +++ b/xo_install.sh @@ -37,10 +37,6 @@ cd packages/xo-server 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 -cd $xo_web_dir - -/usr/bin/yarn -/usr/bin/yarn build if [[ ! -e $systemd_service_dir/$xo_service ]] ; then From b7887a36cbf615b44a93ef511a93487a090d531e Mon Sep 17 00:00:00 2001 From: Jarli01 Date: Wed, 7 Feb 2018 10:16:50 -0500 Subject: [PATCH 04/10] Update xo_install.sh more changes. . . --- xo_install.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xo_install.sh b/xo_install.sh index c2881c0..696d596 100644 --- a/xo_install.sh +++ b/xo_install.sh @@ -33,8 +33,7 @@ sudo /usr/bin/apt-get install --yes build-essential redis-server libpng-dev git # Patch to allow config restore sed -i 's/< 5/> 0/g' /opt/xen-orchestra/xo-web/dist/src/xo-app/settings/config/index.js -cd packages/xo-server - +cd /opt/xen-orchestra/packages/xo-server 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 From e94425813b6b287183365dd61aa789d6374e0aa6 Mon Sep 17 00:00:00 2001 From: Jarli01 Date: Wed, 7 Feb 2018 10:27:50 -0500 Subject: [PATCH 05/10] Update xo_install.sh more fixes to paths --- xo_install.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xo_install.sh b/xo_install.sh index 696d596..ae56853 100644 --- a/xo_install.sh +++ b/xo_install.sh @@ -33,7 +33,11 @@ sudo /usr/bin/apt-get install --yes build-essential redis-server libpng-dev git # Patch to allow config restore sed -i 's/< 5/> 0/g' /opt/xen-orchestra/xo-web/dist/src/xo-app/settings/config/index.js -cd /opt/xen-orchestra/packages/xo-server +cd $xo_server_dir +/usr/bin/yarn +/usr/bin/yarn build + +cd packages/xo-server 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 From af596a2f583184b6fa01cc6eb2619d3cce113031 Mon Sep 17 00:00:00 2001 From: Jarli01 Date: Wed, 7 Feb 2018 10:33:04 -0500 Subject: [PATCH 06/10] Update xo_install.sh typo fixes. --- xo_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xo_install.sh b/xo_install.sh index ae56853..f4dfbfe 100644 --- a/xo_install.sh +++ b/xo_install.sh @@ -28,7 +28,7 @@ sudo /usr/local/bin/n stable #Install XO dependencies 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_server +/usr/bin/git clone -b $xo_server_dir # Patch to allow config restore sed -i 's/< 5/> 0/g' /opt/xen-orchestra/xo-web/dist/src/xo-app/settings/config/index.js From 5da3a6d022e0b5dc328af420302a01b2a7468861 Mon Sep 17 00:00:00 2001 From: Jarli01 Date: Wed, 7 Feb 2018 10:35:30 -0500 Subject: [PATCH 07/10] Update xo_install.sh --- xo_install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/xo_install.sh b/xo_install.sh index f4dfbfe..2d4496c 100644 --- a/xo_install.sh +++ b/xo_install.sh @@ -29,6 +29,7 @@ sudo /usr/local/bin/n stable 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_server_dir +/usr/bin/git clone -b $xo_branch # Patch to allow config restore sed -i 's/< 5/> 0/g' /opt/xen-orchestra/xo-web/dist/src/xo-app/settings/config/index.js From db1580301a1859701b6e3c70209ac8d32c0fdfe8 Mon Sep 17 00:00:00 2001 From: Jarli01 Date: Wed, 7 Feb 2018 10:36:56 -0500 Subject: [PATCH 08/10] Update xo_install.sh --- xo_install.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xo_install.sh b/xo_install.sh index 2d4496c..f6b2d1b 100644 --- a/xo_install.sh +++ b/xo_install.sh @@ -28,8 +28,7 @@ sudo /usr/local/bin/n stable #Install XO dependencies 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_server_dir -/usr/bin/git clone -b $xo_branch +/usr/bin/git clone -b $xo_branch $xo_server # Patch to allow config restore sed -i 's/< 5/> 0/g' /opt/xen-orchestra/xo-web/dist/src/xo-app/settings/config/index.js From e5dc51991f1c2d0e2c8a92ec5f22a33e699120df Mon Sep 17 00:00:00 2001 From: Jarli01 Date: Wed, 7 Feb 2018 10:54:31 -0500 Subject: [PATCH 09/10] Update xo_install.sh more fixes to allow importing a config file. --- xo_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xo_install.sh b/xo_install.sh index f6b2d1b..9eaec3f 100644 --- a/xo_install.sh +++ b/xo_install.sh @@ -31,7 +31,7 @@ sudo /usr/bin/apt-get install --yes build-essential redis-server libpng-dev git /usr/bin/git clone -b $xo_branch $xo_server # Patch to allow config restore -sed -i 's/< 5/> 0/g' /opt/xen-orchestra/xo-web/dist/src/xo-app/settings/config/index.js +sed -i 's/< 5/> 0/g' /opt/xen-orchestra/packages/xo-web/dist/src/xo-app/settings/config/index.js cd $xo_server_dir /usr/bin/yarn From 0eb7c14134a44d71f1c75b960d8a5b1b3955d299 Mon Sep 17 00:00:00 2001 From: Jarli01 Date: Wed, 7 Feb 2018 14:41:05 -0500 Subject: [PATCH 10/10] Update xo_install.sh --- xo_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xo_install.sh b/xo_install.sh index 9eaec3f..3dc1818 100644 --- a/xo_install.sh +++ b/xo_install.sh @@ -31,7 +31,7 @@ sudo /usr/bin/apt-get install --yes build-essential redis-server libpng-dev git /usr/bin/git clone -b $xo_branch $xo_server # Patch to allow config restore -sed -i 's/< 5/> 0/g' /opt/xen-orchestra/packages/xo-web/dist/src/xo-app/settings/config/index.js +sed -i 's/< 5/> 0/g' /opt/xen-orchestra/packages/xo-web/src/xo-app/settings/config/index.js cd $xo_server_dir /usr/bin/yarn