move m3 apps to a file on m3

src/assets/config/computesites.dev.json

@@ -6,34 +6,25 @@
     "dtn": "m3-dtn1.massive.org.au",
     "cafingerprint": "RSA SHA256:cmDxHrZQSPlBMUUcI/BWmruXho1XOzfXPDHSqVTwV2I",
     "appCatalog": [],
-    "appCatalogUri": "./assets/config/m3apps.dev.json",
-    "cancelcmd": "/usr/local/sv2/dev/sv2scancel.sh {jobid}",
-    "statcmd": "/usr/local/sv2/dev/sv2stat.py",
+    "appCatalogCmd": "cat /usr/local/sv2/dev/apps.json",
+    "cancelcmd": "/usr/local/sv2/dev/scripts/bin/s2cancel {jobid}",
+    "statcmd": "/usr/local/sv2/dev/scripts/bin/s2stat",
     "userhealth": "/usr/local/userhealth/0.0.2/bin/uijson",
+    "cacheturis": [],
     "contact": "<MASSIVE Support> help@massive.org.au"
-
   },
   {
-    "url": "https://strudel2-api-dev.cloud.cvl.org.au/cvluwa/",
-    "name": "CVL@UWA",
-    "host": "146.118.65.246",
-    "dtn": "146.118.65.246",
-    "cafingerprint": "RSA SHA256:cmDxHrZQSPlBMUUcI/BWmruXho1XOzfXPDHSqVTwV2I",
-    "appCatalog": [],
-    "appCatalogUri": "./assets/config/cvluwaapps.dev.json",
-    "cancelcmd": "/usr/local/sv2/dev/sv2scancel.sh {jobid}",
-    "statcmd": "/usr/local/sv2/dev/sv2stat.py",
-    "contact": "<MASSIVE Support> help@massive.org.au"
-  },
-  {
-    "url": null ,
-    "name": "Vault-V2@Monash",
-    "host": "dtn-2.erc.monash.edu.au",
-    "dtn": "dtn-2.erc.monash.edu.au",
-    "lscmd": "/srv/home/chines/hsmls.py",
-    "dtnport": "33001",
-    "cafingerprint": "RSA SHA256:cmDxHrZQSPlBMUUcI/BWmruXho1XOzfXPDHSqVTwV2I",
+    "url": "https://strudel2-api-dev.cloud.cvl.org.au/m3/",
+    "name": "OzStar",
+    "host": "ozstar.swin.edu.au",
+    "dtn": "ozstar.swin.edu.au",
+    "cafingerprint": "RSA SHA256:gK5t29EO9zIbWartnIFIpzewWQcPWpj2D9nZ9HOS29Y",
     "appCatalog": [],
-    "appCatalogUri": null
+    "appCatalogCmd": "cat /dagg/strudel/dev/apps.json",
+    "cancelcmd": "/dagg/strudel/dev/bin/s2cancel {jobid}",
+    "statcmd": "/dagg/strudel/dev/bin/s2stat",
+    "userhealth": "/dagg/strudel/dev/bin/uijson",
+    "cacheturis": [],
+    "contact": "<OzStar Support> hpc-support@swin.edu.au"
   }
 ]

src/assets/config/computesites.json

 [
   {
-    "url": "http://localhost:5000/",
+    "url": "https://strudel2-api-dev.cloud.cvl.org.au/m3/",
     "name": "M3",
     "host": "m3-login2.massive.org.au",
     "dtn": "m3-dtn1.massive.org.au",
     "cafingerprint": "RSA SHA256:cmDxHrZQSPlBMUUcI/BWmruXho1XOzfXPDHSqVTwV2I",
     "appCatalog": [],
-    "appCatalogUri": "./assets/config/m3apps.dev.json",
-    "cancelcmd": "/usr/local/sv2/dev/sv2scancel.sh {jobid}",
-    "statcmd": "/usr/local/sv2/dev/sv2stat.py",
+    "appCatalogCmd": "cat /usr/local/sv2/dev/apps.json",
+    "cancelcmd": "/usr/local/sv2/dev/scripts/bin/s2cancel {jobid}",
+    "statcmd": "/usr/local/sv2/dev/scripts/bin/s2stat",
     "userhealth": "/usr/local/userhealth/0.0.2/bin/uijson",
-    "cacheturis": ["https://cachet-dev.erc.monash.edu.au/api/v1/incidents"],
+    "cacheturis": [],
     "contact": "<MASSIVE Support> help@massive.org.au"
   },
   {
     "url": "https://strudel2-api-dev.cloud.cvl.org.au/m3/",
-    "name": "Mahuika",
-    "host": "localhost:2222",
-    "dtn": "localhost:2222",
-    "cafingerprint": "RSA SHA256:cmDxHrZQSPlBMUUcI/BWmruXho1XOzfXPDHSqVTwV2I",
+    "name": "OzStar",
+    "host": "ozstar.swin.edu.au",
+    "dtn": "ozstar.swin.edu.au",
+    "cafingerprint": "RSA SHA256:gK5t29EO9zIbWartnIFIpzewWQcPWpj2D9nZ9HOS29Y",
     "appCatalog": [],
-    "appCatalogCmd": "cat /home/chines/mahuikaapps.dev.json",
-    "cancelcmd": "/home/chines/sv2scancel.sh {jobid}",
-    "statcmd": "/home/chines/sv2stat.py",
-    "userhealth": "/home/chines/uijson.py",
+    "appCatalogCmd": "cat /dagg/strudel/dev/apps.json",
+    "cancelcmd": "/dagg/strudel/dev/bin/s2cancel {jobid}",
+    "statcmd": "/dagg/strudel/dev/bin/s2stat",
+    "userhealth": "/dagg/strudel/dev/bin/uijson",
     "cacheturis": [],
-    "contact": "<MASSIVE Support> help@massive.org.au"
-  },
-  {
-    "url": "https://strudel2-api-dev.cloud.cvl.org.au/cvluwa/",
-    "name": "CVL@UWA",
-    "host": "146.118.65.246",
-    "dtn": "146.118.65.246",
-    "cafingerprint": "RSA SHA256:cmDxHrZQSPlBMUUcI/BWmruXho1XOzfXPDHSqVTwV2I",
-    "appCatalog": [],
-    "appCatalogUri": "./assets/config/cvluwaapps.dev.json",
-    "cancelcmd": "/usr/local/sv2/dev/sv2scancel.sh {jobid}",
-    "statcmd": "/usr/local/sv2/dev/sv2stat.py",
-    "contact": "<CVL@UWA Support> help@massive.org.au"
-  },
-  {
-    "url": null ,
-    "name": "Vault-V2@Monash",
-    "host": "dtn-2.erc.monash.edu.au",
-    "dtn": "dtn-2.erc.monash.edu.au",
-    "lscmd": "/srv/home/chines/hsmls.py",
-    "dtnport": "33001",
-    "cafingerprint": "RSA SHA256:cmDxHrZQSPlBMUUcI/BWmruXho1XOzfXPDHSqVTwV2I",
-    "appCatalog": [],
-    "appCatalogUri": null
+    "contact": "<OzStar Support> hpc-support@swin.edu.au"
   }
 ]