diff --git a/apache/conf/niagadm.conf b/apache/conf/sinqimaging.conf similarity index 56% rename from apache/conf/niagadm.conf rename to apache/conf/sinqimaging.conf index 0797b18..746929b 100644 --- a/apache/conf/niagadm.conf +++ b/apache/conf/sinqimaging.conf @@ -1,26 +1,26 @@ - ServerName niagadm.psi.ch - DocumentRoot /var/www/niagadm + ServerName sinqimaging.psi.ch + DocumentRoot /var/www/sinqimaging # Allow CGI everywhere if needed Options +ExecCGI AddHandler cgi-script .pl .cgi .x .py - + Options +ExecCGI AllowOverride None Require all granted # Explicit CGI directories - ScriptAlias /cgi-bin/ /var/www/niagadm/cgi-bin/ - + ScriptAlias /cgi-bin/ /var/www/sinqimaging/cgi-bin/ + Options +ExecCGI Require all granted - ScriptAlias /cgibin/ /var/www/niagadm/cgibin/ - + ScriptAlias /cgibin/ /var/www/sinqimaging/cgibin/ + Options +ExecCGI Require all granted diff --git a/conf.d/mcda-dss.conf b/conf.d/mcda-dss.conf new file mode 100644 index 0000000..204f66a --- /dev/null +++ b/conf.d/mcda-dss.conf @@ -0,0 +1,21 @@ +server { + listen 80; + server_name mcda-dss-test.psi.ch; + return 301 https://$host$request_uri; +} + +server { + listen 443 ssl; + server_name mcda-dss-test.psi.ch; + + ssl_certificate /etc/nginx/certs/mcda-dss-test.psi.ch.crt; + ssl_certificate_key /etc/nginx/private/mcda-dss-test.psi.ch.key; + + location / { + proxy_pass http://mcda-dss:8050; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } +} \ No newline at end of file diff --git a/conf.d/niagadm.conf b/conf.d/sinqimaging.conf similarity index 58% rename from conf.d/niagadm.conf rename to conf.d/sinqimaging.conf index 505626c..071e4e9 100644 --- a/conf.d/niagadm.conf +++ b/conf.d/sinqimaging.conf @@ -1,19 +1,19 @@ server { listen 80; - server_name niagadm.psi.ch; + server_name sinqimaging.psi.ch; return 301 https://$host$request_uri; } server { listen 443 ssl; - server_name niagadm.psi.ch; + server_name sinqimaging.psi.ch; - ssl_certificate /etc/nginx/certs/niagadm.psi.ch.crt; - ssl_certificate_key /etc/nginx/private/niagadm.psi.ch.key; + ssl_certificate /etc/nginx/certs/sinqimaging.psi.ch.crt; + ssl_certificate_key /etc/nginx/private/sinqimaging.psi.ch.key; - access_log /var/log/nginx/niagadm.access.log; - error_log /var/log/nginx/niagadm.error.log; + access_log /var/log/nginx/sinqimaging.access.log; + error_log /var/log/nginx/sinqimaging.error.log; # Proxy EVERYTHING to the Apache container location / { diff --git a/docker-compose.yaml b/docker-compose.yaml index 725de8d..e16a454 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -37,7 +37,7 @@ services: - /opt/webcontent/fluid-eos:/var/www/fluid-eos:rw - /opt/webcontent/sls2:/var/www/sls2:rw - /opt/webcontent/megwiki:/var/www/megwiki:rw - - /opt/webcontent/niagadm:/var/www/niagadm:rw + - /opt/webcontent/sinqimaging:/var/www/sinqimaging:rw - /opt/webcontent/omny:/var/www/omny:rw - /mount/srem/webhosting:/var/www/srem:rw - ./apache/conf:/etc/apache2/sites-enabled:ro @@ -92,6 +92,15 @@ services: # Huang He # Also installed on docker-dmz # PSI Service + # MCDA DSS + mcda-dss: + image: gitea.psi.ch/images/mcda-dss:0.1.0 + container_name: mcda-dss + restart: always + networks: + - backend + + # MCDA Calculator mcda-calculator: image: gitea.psi.ch/images/mcda-calculator:1.0.3 container_name: mcda-calculator @@ -99,6 +108,7 @@ services: networks: - backend + # Romain Sacchi swiss-ecargo: image: gitea.psi.ch/sacchi_r/swiss-ecargo:0.1.2 @@ -206,7 +216,7 @@ services: - it_strategy_dashboard_backend it-strategy-dashboard-backend: - image: gitea.psi.ch/9501/it-strategy-dashboard-backend:4.0.2 + image: gitea.psi.ch/9501/it-strategy-dashboard-backend:4.0.3 container_name: it-strategy-dashboard-backend restart: always environment: