Commit cad00fa6 authored by Chris Hines's avatar Chris Hines
Browse files

Merge branch 'dev' into 'test'

Dev

See merge request !102
parents 77fcb25e c0f5d7de
Pipeline #19425 passed with stages
in 8 minutes and 36 seconds
......@@ -2,7 +2,7 @@ location ~ /.* {
root /opt/strudel2/spa/sv2/;
#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 Content-Security-Policy "default-src 'self' cvl.qriscloud.org.au *.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";
......
......@@ -6,9 +6,23 @@
"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": "CVL",
"name": "CVL@MASSIVE",
"icon": null,
"scope": "user:email",
"cafingerprint": "ECDSA SHA256:6wVXdokvvlTNcXPMc9KyvIXA8a8XNfLuhBfNOYeeMdg",
"desc": "<div>The Characterisation Virtual Laboratory remote desktop services are available here. The service provides software, data and compute for researchers in the Characterisation research community. For CVL desktop researchers from MASSIVE see <a href=https://www.massive.org.au>https://www.massive.org.au</a> for more information. For CVL desktop users from other infrastructures see <a href=https://www.cvl.org.au>https://www.cvl.org.au</a></div>"
}]
},
{
"authorise": "https://cvl.qriscloud.org.au/pysshauthz/oauth2/oauth/authorize/choose",
"base": "https://cvl.qriscloud.org.au/pysshauthz/oauth2/",
"cafingerprint": "SHA256:vKhsApBoirObqXaDBa8+9+27xmHHqctYAUAWVpmZhsk",
"client_id": "Q96kt2Vtw6S78dpORktM81DH",
"desc": "<div>This is the cluster Awoonga @ University of Queensland</div>",
"icon": null,
"logout": "https://cvl.qriscloud.org.au/pysshauthz/oauth2/logout",
"name": "CVL@Awoonga",
"scope": "user:email",
"sign": "https://cvl.qriscloud.org.au/pysshauthz/sign/awoonga/api/v1/sign_key"
}
]
......@@ -11,5 +11,18 @@
"scope": "user:email",
"cafingerprint": "ECDSA SHA256:6wVXdokvvlTNcXPMc9KyvIXA8a8XNfLuhBfNOYeeMdg",
"desc": "<div>The Characterisation Virtual Laboratory remote desktop services are available here. The service provides software, data and compute for researchers in the Characterisation research community. For CVL desktop researchers from MASSIVE see <a href=https://www.massive.org.au>https://www.massive.org.au</a> for more information. For CVL desktop users from other infrastructures see <a href=https://www.cvl.org.au>https://www.cvl.org.au</a></div>"
}
},
{
"authorise": "https://cvl.qriscloud.org.au/pysshauthz/oauth2/oauth/authorize/choose",
"base": "https://cvl.qriscloud.org.au/pysshauthz/oauth2/",
"cafingerprint": "SHA256:vKhsApBoirObqXaDBa8+9+27xmHHqctYAUAWVpmZhsk",
"client_id": "Q96kt2Vtw6S78dpORktM81DH",
"desc": "<div>This is the cluster Awoonga @ University of Queensland</div>",
"icon": null,
"logout": "https://cvl.qriscloud.org.au/pysshauthz/oauth2/logout",
"name": "CVL@Awoonga",
"scope": "user:email",
"sign": "https://cvl.qriscloud.org.au/pysshauthz/sign/awoonga/api/v1/sign_key"
}
]
......@@ -26,5 +26,73 @@
"userhealth": "/dagg/strudel/dev/bin/uijson",
"cacheturis": [],
"contact": "<OzStar Support> hpc-support@swin.edu.au"
}
},
{
"appCatalog": [
{
"appactions": [],
"applist": null,
"desc": "<br/>This application runs a VNC server and uses novnc to connect to it<br/>",
"instactions": [
{
"client": {
"cmd": null,
"redir": "vnc.html?resize=remote&password={password}"
},
"name": "Connect",
"paramscmd": "/gpfs1/sw7/CVL/strudel2_cluster/scripts/desktop/params.py {jobid}",
"states": [
"RUNNING"
]
},
{
"client": {
"cmd": null,
"redir": "?token={token}"
},
"name": "View log",
"paramscmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/wstool cat \"\"",
"states": [
"RUNNING",
"Finished"
]
},
{
"client": {
"cmd": null,
"redir": "?token={token}"
},
"name": "View Usage",
"paramscmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/wstool sacct -j {jobid}",
"states": [
"Finished"
]
},
{
"client": null,
"name": "Remove log",
"notunnel": true,
"paramscmd": "rm ; echo []",
"states": [
"Finished"
]
}
],
"localbind": true,
"name": "Desktop",
"startscript": "#!/bin/bash\n/gpfs1/sw7/CVL/strudel2_cluster/scripts/desktop/start.sh\n ",
"url": null
}
],
"appCatalogCmd": null,
"cacheturis": [],
"cafingerprint": "SHA256:vKhsApBoirObqXaDBa8+9+27xmHHqctYAUAWVpmZhsk",
"cancelcmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/s2cancel {jobid}",
"contact": "support@qriscloud.org.au",
"host": "awoonga.qriscloud.org.au",
"name": "",
"statcmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/s2stat",
"url": "https://strudel2-api-dev.cloud.cvl.org.au/generic/",
"userhealth": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/uijson"
}
]
......@@ -12,5 +12,74 @@
"userhealth": "/usr/local/clusterinfo/0.0.6/bin/uijson",
"cacheturis": ["/assets/config/incidents.json"],
"contact": "<MASSIVE Support> help@massive.org.au"
}
},
{
"appCatalog": [
{
"appactions": [],
"applist": null,
"desc": "<br/>This application runs a VNC server and uses novnc to connect to it<br/>",
"instactions": [
{
"client": {
"cmd": null,
"redir": "vnc.html?resize=remote&password={password}"
},
"name": "Connect",
"paramscmd": "/gpfs1/sw7/CVL/strudel2_cluster/scripts/desktop/params.py {jobid}",
"states": [
"RUNNING"
]
},
{
"client": {
"cmd": null,
"redir": "?token={token}"
},
"name": "View log",
"paramscmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/wstool cat \"\"",
"states": [
"RUNNING",
"Finished"
]
},
{
"client": {
"cmd": null,
"redir": "?token={token}"
},
"name": "View Usage",
"paramscmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/wstool sacct -j {jobid}",
"states": [
"Finished"
]
},
{
"client": null,
"name": "Remove log",
"notunnel": true,
"paramscmd": "rm ; echo []",
"states": [
"Finished"
]
}
],
"localbind": true,
"name": "Desktop",
"startscript": "#!/bin/bash\n/gpfs1/sw7/CVL/strudel2_cluster/scripts/desktop/start.sh\n ",
"url": null
}
],
"appCatalogCmd": null,
"cacheturis": [],
"cafingerprint": "SHA256:vKhsApBoirObqXaDBa8+9+27xmHHqctYAUAWVpmZhsk",
"cancelcmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/s2cancel {jobid}",
"contact": "support@qriscloud.org.au",
"host": "awoonga.qriscloud.org.au",
"name": "",
"statcmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/s2stat",
"url": "https://strudel2-api-dev.cloud.cvl.org.au/generic/",
"userhealth": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/uijson"
}
]
......@@ -11,5 +11,73 @@
"statcmd": "/usr/local/strudel2_cluster/latest/bin/s2stat",
"cacheturis": ["/assets/config/incidents.json"],
"userhealth": "/usr/local/clusterinfo/0.0.6/bin/uijson"
}
},
{
"appCatalog": [
{
"appactions": [],
"applist": null,
"desc": "<br/>This application runs a VNC server and uses novnc to connect to it<br/>",
"instactions": [
{
"client": {
"cmd": null,
"redir": "vnc.html?resize=remote&password={password}"
},
"name": "Connect",
"paramscmd": "/gpfs1/sw7/CVL/strudel2_cluster/scripts/desktop/params.py {jobid}",
"states": [
"RUNNING"
]
},
{
"client": {
"cmd": null,
"redir": "?token={token}"
},
"name": "View log",
"paramscmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/wstool cat \"\"",
"states": [
"RUNNING",
"Finished"
]
},
{
"client": {
"cmd": null,
"redir": "?token={token}"
},
"name": "View Usage",
"paramscmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/wstool sacct -j {jobid}",
"states": [
"Finished"
]
},
{
"client": null,
"name": "Remove log",
"notunnel": true,
"paramscmd": "rm ; echo []",
"states": [
"Finished"
]
}
],
"localbind": true,
"name": "Desktop",
"startscript": "#!/bin/bash\n/gpfs1/sw7/CVL/strudel2_cluster/scripts/desktop/start.sh\n ",
"url": null
}
],
"appCatalogCmd": null,
"cacheturis": [],
"cafingerprint": "SHA256:vKhsApBoirObqXaDBa8+9+27xmHHqctYAUAWVpmZhsk",
"cancelcmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/s2cancel {jobid}",
"contact": "support@qriscloud.org.au",
"host": "awoonga.qriscloud.org.au",
"name": "",
"statcmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/s2stat",
"url": "https://strudel2-api-dev.cloud.cvl.org.au/generic/",
"userhealth": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/uijson"
}
]
......@@ -25,5 +25,74 @@
"userhealth": "/home/strudel2/bin/uijson",
"cacheturis": [],
"contact": "<CVL@UWA Support> help@massive.org.au"
}
},
{
"appCatalog": [
{
"appactions": [],
"applist": null,
"desc": "<br/>This application runs a VNC server and uses novnc to connect to it<br/>",
"instactions": [
{
"client": {
"cmd": null,
"redir": "vnc.html?resize=remote&password={password}"
},
"name": "Connect",
"paramscmd": "/gpfs1/sw7/CVL/strudel2_cluster/scripts/desktop/params.py {jobid}",
"states": [
"RUNNING"
]
},
{
"client": {
"cmd": null,
"redir": "?token={token}"
},
"name": "View log",
"paramscmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/wstool cat \"\"",
"states": [
"RUNNING",
"Finished"
]
},
{
"client": {
"cmd": null,
"redir": "?token={token}"
},
"name": "View Usage",
"paramscmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/wstool sacct -j {jobid}",
"states": [
"Finished"
]
},
{
"client": null,
"name": "Remove log",
"notunnel": true,
"paramscmd": "rm ; echo []",
"states": [
"Finished"
]
}
],
"localbind": true,
"name": "Desktop",
"startscript": "#!/bin/bash\n/gpfs1/sw7/CVL/strudel2_cluster/scripts/desktop/start.sh\n ",
"url": null
}
],
"appCatalogCmd": null,
"cacheturis": [],
"cafingerprint": "SHA256:vKhsApBoirObqXaDBa8+9+27xmHHqctYAUAWVpmZhsk",
"cancelcmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/s2cancel {jobid}",
"contact": "support@qriscloud.org.au",
"host": "awoonga.qriscloud.org.au",
"name": "",
"statcmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/s2stat",
"url": "https://strudel2-api-dev.cloud.cvl.org.au/generic/",
"userhealth": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/uijson"
}
]
......@@ -26,5 +26,74 @@
"userhealth": "/dagg/strudel/dev/bin/uijson",
"cacheturis": [],
"contact": "<OzStar Support> hpc-support@swin.edu.au"
}
},
{
"appCatalog": [
{
"appactions": [],
"applist": null,
"desc": "<br/>This application runs a VNC server and uses novnc to connect to it<br/>",
"instactions": [
{
"client": {
"cmd": null,
"redir": "vnc.html?resize=remote&password={password}"
},
"name": "Connect",
"paramscmd": "/gpfs1/sw7/CVL/strudel2_cluster/scripts/desktop/params.py {jobid}",
"states": [
"RUNNING"
]
},
{
"client": {
"cmd": null,
"redir": "?token={token}"
},
"name": "View log",
"paramscmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/wstool cat \"\"",
"states": [
"RUNNING",
"Finished"
]
},
{
"client": {
"cmd": null,
"redir": "?token={token}"
},
"name": "View Usage",
"paramscmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/wstool sacct -j {jobid}",
"states": [
"Finished"
]
},
{
"client": null,
"name": "Remove log",
"notunnel": true,
"paramscmd": "rm ; echo []",
"states": [
"Finished"
]
}
],
"localbind": true,
"name": "Desktop",
"startscript": "#!/bin/bash\n/gpfs1/sw7/CVL/strudel2_cluster/scripts/desktop/start.sh\n ",
"url": null
}
],
"appCatalogCmd": null,
"cacheturis": [],
"cafingerprint": "SHA256:vKhsApBoirObqXaDBa8+9+27xmHHqctYAUAWVpmZhsk",
"cancelcmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/s2cancel {jobid}",
"contact": "support@qriscloud.org.au",
"host": "awoonga.qriscloud.org.au",
"name": "",
"statcmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/s2stat",
"url": "https://strudel2-api-dev.cloud.cvl.org.au/generic/",
"userhealth": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/uijson"
}
]
......@@ -11,5 +11,17 @@
"scope": "user:email",
"cafingerprint": "ECDSA SHA256:6wVXdokvvlTNcXPMc9KyvIXA8a8XNfLuhBfNOYeeMdg",
"desc": "<div>The Characterisation Virtual Laboratory remote desktop services are available here. The service provides software, data and compute for researchers in the Characterisation research community. For CVL desktop researchers from MASSIVE see <a href=https://www.massive.org.au>https://www.massive.org.au</a> for more information. For CVL desktop users from other infrastructures see <a href=https://www.cvl.org.au>https://www.cvl.org.au</a></div>"
}
},
{
"authorise": "https://cvl.qriscloud.org.au/pysshauthz/oauth2/oauth/authorize/choose",
"base": "https://cvl.qriscloud.org.au/pysshauthz/oauth2/",
"cafingerprint": "SHA256:vKhsApBoirObqXaDBa8+9+27xmHHqctYAUAWVpmZhsk",
"client_id": "Q96kt2Vtw6S78dpORktM81DH",
"desc": "<div>This is the cluster Awoonga @ University of Queensland</div>",
"icon": null,
"logout": "https://cvl.qriscloud.org.au/pysshauthz/oauth2/logout",
"name": "CVL@Awoonga",
"scope": "user:email",
"sign": "https://cvl.qriscloud.org.au/pysshauthz/sign/awoonga/api/v1/sign_key"
}
]
......@@ -11,5 +11,73 @@
"statcmd": "/usr/local/strudel2_cluster/latest/bin/s2stat",
"cacheturis": ["/assets/config/incidents.json"],
"userhealth": "/usr/local/clusterinfo/0.0.6/bin/uijson"
}
},
{
"appCatalog": [
{
"appactions": [],
"applist": null,
"desc": "<br/>This application runs a VNC server and uses novnc to connect to it<br/>",
"instactions": [
{
"client": {
"cmd": null,
"redir": "vnc.html?resize=remote&password={password}"
},
"name": "Connect",
"paramscmd": "/gpfs1/sw7/CVL/strudel2_cluster/scripts/desktop/params.py {jobid}",
"states": [
"RUNNING"
]
},
{
"client": {
"cmd": null,
"redir": "?token={token}"
},
"name": "View log",
"paramscmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/wstool cat \"\"",
"states": [
"RUNNING",
"Finished"
]
},
{
"client": {
"cmd": null,
"redir": "?token={token}"
},
"name": "View Usage",
"paramscmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/wstool sacct -j {jobid}",
"states": [
"Finished"
]
},
{
"client": null,
"name": "Remove log",
"notunnel": true,
"paramscmd": "rm ; echo []",
"states": [
"Finished"
]
}
],
"localbind": true,
"name": "Desktop",
"startscript": "#!/bin/bash\n/gpfs1/sw7/CVL/strudel2_cluster/scripts/desktop/start.sh\n ",
"url": null
}
],
"appCatalogCmd": null,
"cacheturis": [],
"cafingerprint": "SHA256:vKhsApBoirObqXaDBa8+9+27xmHHqctYAUAWVpmZhsk",
"cancelcmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/s2cancel {jobid}",
"contact": "support@qriscloud.org.au",
"host": "awoonga.qriscloud.org.au",
"name": "",
"statcmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/s2stat",
"url": "https://strudel2-api-dev.cloud.cvl.org.au/generic/",
"userhealth": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/uijson"
}
]
......@@ -23,5 +23,18 @@
"scope": "user:email",
"cafp": "RSA SHA256:gK5t29EO9zIbWartnIFIpzewWQcPWpj2D9nZ9HOS29Y",
"desc": "<div><div>Log into OzStar@Swinburne University</div></div>"
}
},
{
"authorise": "https://cvl.qriscloud.org.au/pysshauthz/oauth2/oauth/authorize/choose",
"base": "https://cvl.qriscloud.org.au/pysshauthz/oauth2/",
"cafingerprint": "SHA256:vKhsApBoirObqXaDBa8+9+27xmHHqctYAUAWVpmZhsk",
"client_id": "Q96kt2Vtw6S78dpORktM81DH",
"desc": "<div>This is the cluster Awoonga @ University of Queensland</div>",
"icon": null,
"logout": "https://cvl.qriscloud.org.au/pysshauthz/oauth2/logout",
"name": "CVL@Awoonga",
"scope": "user:email",
"sign": "https://cvl.qriscloud.org.au/pysshauthz/sign/awoonga/api/v1/sign_key"
}
]
......@@ -25,5 +25,74 @@
"userhealth": "/home/strudel2/bin/uijson",
"cacheturis": [],
"contact": "<CVL@UWA Support> help@massive.org.au"
}
},
{
"appCatalog": [
{
"appactions": [],
"applist": null,
"desc": "<br/>This application runs a VNC server and uses novnc to connect to it<br/>",
"instactions": [
{
"client": {
"cmd": null,
"redir": "vnc.html?resize=remote&password={password}"
},
"name": "Connect",
"paramscmd": "/gpfs1/sw7/CVL/strudel2_cluster/scripts/desktop/params.py {jobid}",
"states": [
"RUNNING"
]
},
{
"client": {
"cmd": null,
"redir": "?token={token}"
},
"name": "View log",
"paramscmd": "/gpfs1/sw7/CVL/strudel2_cluster/miniconda3/envs/s2_cluster/bin/wstool cat \"\"",
"states": [
"RUNNING",
"Finished"
]
},
{