Skip to content
Snippets Groups Projects
Commit 6a1c5009 authored by Chris Hines's avatar Chris Hines
Browse files

ask s2 to pull incidents.json from the same server that served up the SPA

parent a985e200
No related branches found
No related tags found
4 merge requests!106if stat fails, display the error instead of immediately refreshing...,!99Dev,!91Test,!90Dev
Pipeline #15960 passed
Stage: build
    Stage: deploy
      Hide whitespace changes
      Inline Side-by-side
      src/assets/config/computesites.json
      + 2
      − 2
      View file @ 6a1c5009
      ...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
      "appCatalogCmd": "/usr/local/strudel2_cluster/latest/bin/getapps", "appCatalogCmd": "/usr/local/strudel2_cluster/latest/bin/getapps",
      "cancelcmd": "/usr/local/strudel2_cluster/latest/bin/s2cancel {jobid}", "cancelcmd": "/usr/local/strudel2_cluster/latest/bin/s2cancel {jobid}",
      "statcmd": "/usr/local/strudel2_cluster/latest/bin/s2stat", "statcmd": "/usr/local/strudel2_cluster/latest/bin/s2stat",
      "userhealth": "/usr/local/bin/uijson", "userhealth": "/home/chines/clusterinfo_venv/bin/show_cluster --jsondesktopsummary",
      "cacheturis": [], "cacheturis": ["/assets/config/incidents.json"],
      "contact": "<MASSIVE Support> help@massive.org.au" "contact": "<MASSIVE Support> help@massive.org.au"
      } }
      ] ]
      src/assets/config/computesites.prod.json
      + 1
      − 0
      View file @ 6a1c5009
      ...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
      "appCatalogCmd": "/usr/local/strudel2_cluster/latest/bin/getapps", "appCatalogCmd": "/usr/local/strudel2_cluster/latest/bin/getapps",
      "cancelcmd": "/usr/local/strudel2_cluster/latest/bin/s2cancel {jobid}", "cancelcmd": "/usr/local/strudel2_cluster/latest/bin/s2cancel {jobid}",
      "statcmd": "/usr/local/strudel2_cluster/latest/bin/s2stat", "statcmd": "/usr/local/strudel2_cluster/latest/bin/s2stat",
      "cacheturis": ["/assets/config/incidents.json"],
      "userhealth": "/usr/local/bin/uijson" "userhealth": "/usr/local/bin/uijson"
      } }
      ] ]
      src/assets/config/computesites.test.json
      + 1
      − 0
      View file @ 6a1c5009
      ...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
      "appCatalogCmd": "/usr/local/strudel2_cluster/latest/bin/getapps", "appCatalogCmd": "/usr/local/strudel2_cluster/latest/bin/getapps",
      "cancelcmd": "/usr/local/strudel2_cluster/latest/bin/s2cancel {jobid}", "cancelcmd": "/usr/local/strudel2_cluster/latest/bin/s2cancel {jobid}",
      "statcmd": "/usr/local/strudel2_cluster/latest/bin/s2stat", "statcmd": "/usr/local/strudel2_cluster/latest/bin/s2stat",
      "cacheturis": ["/assets/config/incidents.json"],
      "userhealth": "/usr/local/bin/uijson" "userhealth": "/usr/local/bin/uijson"
      }, },
      { {
      ......
      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