From 274b323ae0bf9141eee655b7933d3c91e6fd2a3e Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Fri, 4 Dec 2020 09:44:22 +1100
Subject: [PATCH] add config for training.cloud.cvl.org.au
---
.gitlab-ci.yml | 14 ++++++++++++++
install_training.cloud.cvl.org.au.sh | 7 +++++++
.../apiservers.training_cloud_cvl_org_au.json | 9 +++++++++
.../authservers.training_cloud_cvl_org_au.json | 15 +++++++++++++++
.../computesites.training_cloud_cvl_org_au.json | 14 ++++++++++++++
5 files changed, 59 insertions(+)
create mode 100755 install_training.cloud.cvl.org.au.sh
create mode 100644 src/assets/config/apiservers.training_cloud_cvl_org_au.json
create mode 100644 src/assets/config/authservers.training_cloud_cvl_org_au.json
create mode 100644 src/assets/config/computesites.training_cloud_cvl_org_au.json
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e10ad52..ebbabaa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,3 +74,17 @@ deploy_prod_massive.org.au:
- cp ./nginx_snippets/* /etc/nginx/snippets
dependencies:
- build
+
+deploy_prod_training.cloud.cvl.org.au:
+ stage: deploy
+ only:
+ - prod@hpc-team/strudelv2_spa
+ tags:
+ - deploy_prod
+ script:
+ - echo "deploying prod_training.cloud.cvl.org.au"
+ - ls -l
+ - ./install_training.cloud.cvl.org.au.sh
+ - cp ./nginx_snippets/* /etc/nginx/snippets
+ dependencies:
+ - build
diff --git a/install_training.cloud.cvl.org.au.sh b/install_training.cloud.cvl.org.au.sh
new file mode 100755
index 0000000..ae9ad99
--- /dev/null
+++ b/install_training.cloud.cvl.org.au.sh
@@ -0,0 +1,7 @@
+mkdir -p /opt/strudel2/spa/sv2_training.cloud.cvl.org.au
+cp sv2_training.cloud.cvl.org.au.conf /etc/nginx/snippets
+cp -r dist/* /opt/strudel2/spa/sv2_training.cloud.cvl.org.au
+cp -r /opt/strudel2/spa/sv2_training.cloud.cvl.org.au/assets/config/apiservers.training_cloud_cvl_org_au.json /opt/strudel2/spa/sv2_training.cloud.cvl.org.au/assets/config/apiservers.json
+cp -r /opt/strudel2/spa/sv2_training.cloud.cvl.org.au/assets/config/computesites.training_cloud_cvl_org_au.json /opt/strudel2/spa/sv2_training.cloud.cvl.org.au/assets/config/computesites.json
+cp -r /opt/strudel2/spa/sv2_training.cloud.cvl.org.au/assets/config/authservers.training_cloud_cvl_org_au.json /opt/strudel2/spa/sv2_training.cloud.cvl.org.au/assets/config/authservers.json
+echo "you must include /etc/nginx/snippets/sv2.conf in your nginx site config manually"
diff --git a/src/assets/config/apiservers.training_cloud_cvl_org_au.json b/src/assets/config/apiservers.training_cloud_cvl_org_au.json
new file mode 100644
index 0000000..0ef6a77
--- /dev/null
+++ b/src/assets/config/apiservers.training_cloud_cvl_org_au.json
@@ -0,0 +1,9 @@
+[
+ {
+ "name": "Monash",
+ "tes": "https://beta-api.cloud.cvl.org.au/tes",
+ "tws": "https://beta-api.cloud.cvl.org.au"
+ }
+]
+
+
diff --git a/src/assets/config/authservers.training_cloud_cvl_org_au.json b/src/assets/config/authservers.training_cloud_cvl_org_au.json
new file mode 100644
index 0000000..3ca09b2
--- /dev/null
+++ b/src/assets/config/authservers.training_cloud_cvl_org_au.json
@@ -0,0 +1,15 @@
+[
+
+ {
+ "authorise": "https://sshauthz.cloud.cvl.org.au/pysshauthz/oauth2/oauth/authorize/choose",
+ "base": "https://sshauthz.cloud.cvl.org.au/pysshauthz/oauth2/",
+ "client_id": "Q96kt2Vtw6S78dpORktM81DH",
+ "sign": "https://sshauthz.cloud.cvl.org.au/pysshauthz/sign/monash_hpcid/api/v1/sign_key",
+ "logout": "https://sshauthz.cloud.cvl.org.au/pysshauthz/oauth2/logout",
+ "name": "Training@M3",
+ "icon": null,
+ "scope": "user:email",
+ "cafingerprint": "ECDSA SHA256:6wVXdokvvlTNcXPMc9KyvIXA8a8XNfLuhBfNOYeeMdg",
+ "desc": "<div>Training@M3 offers a reduced interface to M3.</div>"
+ }
+]
diff --git a/src/assets/config/computesites.training_cloud_cvl_org_au.json b/src/assets/config/computesites.training_cloud_cvl_org_au.json
new file mode 100644
index 0000000..198d132
--- /dev/null
+++ b/src/assets/config/computesites.training_cloud_cvl_org_au.json
@@ -0,0 +1,14 @@
+[
+ {
+ "url": "https://beta-api.cloud.cvl.org.au/training/",
+ "name": "Training@M3",
+ "host": "m3.massive.org.au",
+ "dtn": "m3-dtn1.massive.org.au",
+ "cafingerprint": "ECDSA SHA256:6wVXdokvvlTNcXPMc9KyvIXA8a8XNfLuhBfNOYeeMdg",
+ "appCatalog": [],
+ "appCatalogCmd": "/usr/local/strudel2_cluster/latest/bin/getapps-training",
+ "cancelcmd": "/usr/local/strudel2_cluster/latest/bin/s2cancel {jobid}",
+ "statcmd": "/usr/local/strudel2_cluster/latest/bin/s2stat",
+ "userhealth": "/usr/local/bin/uitraining"
+ }
+]
--
GitLab