Commit 03a8eb1a authored by Chris Hines's avatar Chris Hines
Browse files

Merge branch 'dev' into 'test'

Dev

See merge request !81
parents e8291848 7365a40c
Pipeline #13071 passed with stages
in 7 minutes and 11 seconds
......@@ -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
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"
location ~ /.* {
root /opt/strudel2/spa/sv2/;
root /opt/strudel2/spa/sv2_massive.org.au/;
#alias /var/www/sv2/dist/sv2/;
try_files $uri$args $uri$args/ $uri/ /index.html;
add_header Content-Security-Policy "default-src 'self' *.cloud.cvl.org.au; style-src 'self' fonts.googleapis.com 'unsafe-inline'; font-src 'self' fonts.gstatic.com";
add_header Content-Security-Policy "default-src 'self' *.cloud.cvl.org.au *.desktop.massive.org.au; style-src 'self' fonts.googleapis.com 'unsafe-inline'; font-src 'self' fonts.gstatic.com";
add_header Strict-Transport-Security "max-age=15768000; includeSubDomains" always;
add_header X-Frame-Options "SAMEORIGIN";
add_header X-XSS-Protection "1; mode=block";
......
[
{
"name": "Monash",
"tes": "https://beta-api.cloud.cvl.org.au/tes",
"tws": "https://beta-api.cloud.cvl.org.au"
}
]
[
{
"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>"
}
]
[
{
"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"
},
{
"url": "https://beta-api.cloud.cvl.org.au/training/",
"name": "Training@CVL@UWA",
"host": "146.118.65.246",
"dtn": "146.118.65.242",
"cafingerprint": "ECDSA SHA256:6wVXdokvvlTNcXPMc9KyvIXA8a8XNfLuhBfNOYeeMdg",
"appCatalog": [],
"appCatalogCmd": "/home/strudel2/bin/getapps-training",
"cancelcmd": "/home/strudel2/bin/s2cancel {jobid}",
"statcmd": "/home/strudel2/bin/s2stat",
"userhealth": "/home/strudel2/bin/uitraining",
"cacheturis": [],
"contact": "<CVL@UWA Support> help@massive.org.au"
}
]
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment