Merge branch 'dev' into 'test'

Dev

See merge request !79

.gitlab-ci.yml

@@ -60,3 +60,17 @@ deploy_prod:
     - cp ./nginx_snippets/* /etc/nginx/snippets
   dependencies:
     - build
+
+deploy_prod_massive.org.au:
+  stage: deploy
+  only:
+    - prod@hpc-team/strudelv2_spa
+  tags: 
+    - deploy_prod
+  script:
+    - echo "deploying prod_massive.org.au" 
+    - ls -l
+    - ./install_massive.org.au.sh
+    - cp ./nginx_snippets/* /etc/nginx/snippets
+  dependencies:
+    - build

install_massive.org.au.sh

+mkdir -p /opt/strudel2/spa/sv2_massive.org.au
+cp sv2_massive.org.au.conf /etc/nginx/snippets
+cp -r dist/* /opt/strudel2/spa/sv2_massive.org.au
+cp -r /opt/strudel2/spa/sv2_massive.org.au/assets/config/apiservers.massive_org_au.json /opt/strudel2/spa/sv2_massive.org.au/assets/config/apiservers.json 
+echo "you must include /etc/nginx/snippets/sv2.conf in your nginx site config manually"

nginx_snippets/sv2_massive.org.au.conf

+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; 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";
+
+}

src/assets/config/apiservers.massive_org_au.json

+[
+    {
+        "name": "Monash",
+        "tes": "https://beta-api.desktop.massive.org.au/tes",
+        "tws": "https://beta-api.desktop.massive.org.au"
+    }
+]
+
+