merge upstream

.gitignore

@@ -0,0 +1 @@
+.env

apache/conf/gfa-status.conf

@@ -15,7 +15,7 @@
     php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -fwebmaster@gfa-status.web.psi.ch"
     php_admin_value upload_tmp_dir /var/www/clients/client45/web70/tmp
     php_admin_value session.save_path /var/www/clients/client45/web70/tmp
-    php_admin_value open_basedir /var/www/clients/client45/web70/web:/var/www/clients/client45/web70/private:/var/www/clients/client45/web70/tmp:/var/www/gfa-status.web.psi.ch/web:/tmp:/usr/share/php:/usr/share/phpmyadmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/var/www/error/
+    php_admin_value open_basedir /var/www/clients/client45/web70/web:/var/www/clients/client45/web70/private:/var/www/clients/client45/web70/tmp:/var/www/gfa-status/web:/tmp:/usr/share/php:/usr/share/phpmyadmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/var/www/error/
 
     <Directory /var/www/gfa-status.web.psi.ch/web>
         Options +FollowSymLinks +Includes

conf.d/actris-test.conf

@@ -0,0 +1,30 @@
+# INC0150202 Kohlbrecher Joachim & Wall Edward Owen
+server {
+    listen 80;
+    server_name actris-test.psi.ch;
+
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name actris-test.psi.ch;
+
+    root /opt/webcontent/actris-test;
+    index index.html;
+
+    ssl_certificate     /etc/nginx/certs/actris-test.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/actris-test.psi.ch.key;
+
+    access_log /var/log/nginx/actris-test.access.log;
+    error_log  /var/log/nginx/actris-test.error.log;
+
+    location / {
+        autoindex on;
+        autoindex_exact_size off;
+        autoindex_localtime on;
+
+        try_files $uri $uri/ =404;
+    }
+}
+

docker-compose.yaml

@@ -18,6 +18,7 @@ services:
       - /etc/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
       - /etc/nginx/conf.d:/etc/nginx/conf.d:ro
       - /opt/webcontent/sinqstatus-test:/opt/webcontent/sinqstatus-test:ro
+      - /mount/actris:/opt/webcontent/actris-test:ro
       - /opt/webcontent/it-strategy-dashboard/frontend/:/opt/webcontent/it-strategy-dashboard/:ro
     networks:
       - public
@@ -182,7 +183,7 @@ services:
 # It-Strategy monitoring dashboard
 
   it-strategy-dashboard-frontend:
-    image: gitea.psi.ch/9501/it-strategy-dashboard-frontend:3.0
+    image: gitea.psi.ch/9501/it-strategy-dashboard-frontend:4.0
     container_name: it-strategy-dashboard-frontend
     command: ["sh","-c","/usr/local/bin/copyData.sh"]
     volumes:
@@ -192,7 +193,7 @@ services:
       - it_strategy_dashboard_backend
 
   it-strategy-dashboard-backend:
-    image: gitea.psi.ch/9501/it-strategy-dashboard-backend:3.0.1
+    image: gitea.psi.ch/9501/it-strategy-dashboard-backend:4.0
     container_name: it-strategy-dashboard-backend
     restart: always
     environment: