Commit 1c45a085 authored by Chris Hines's avatar Chris Hines
Browse files

Merge branch 'dev' into 'test'

Dev

See merge request !83
parents 03a8eb1a 64b8486a
Pipeline #13191 passed with stages
in 7 minutes and 16 seconds
location ~ /.* {
root /opt/strudel2/spa/sv2_training.cloud.cvl.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 *.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";
add_header X-Content-Type-Options "nosniff";
}
......@@ -6,10 +6,10 @@
"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",
"name": "Training",
"icon": null,
"scope": "user:email",
"cafingerprint": "ECDSA SHA256:6wVXdokvvlTNcXPMc9KyvIXA8a8XNfLuhBfNOYeeMdg",
"desc": "<div>Training@M3 offers a reduced interface to M3.</div>"
"desc": "<div>Training offers a training specific interface to our clusters</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",
......@@ -25,5 +13,4 @@
"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