Merge remote-tracking branch 'origin/main'

conf.d/00-default.conf

@@ -0,0 +1,20 @@
+server {
+    listen 80 default_server;
+    listen [::]:80 default_server;
+    server_name _;
+
+    return 404;
+
+}
+
+server {
+    listen 443 ssl default_server;
+    listen [::]:443 ssl default_server;
+    server_name _;
+
+    ssl_certificate /etc/nginx/certs/default.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/default.psi.ch.key;
+
+    return 404;
+}
+

conf.d/fluid-eos-test.conf

@@ -0,0 +1,37 @@
+# Churakov Sergey - ISPD migration
+server {
+    listen 80;
+    server_name fluid-eos-test.psi.ch;
+
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name fluid-eos-test.psi.ch;
+
+    root /opt/webcontent/fluid-eos;
+    index index.html;
+
+    ssl_certificate     /etc/nginx/certs/fluid-eos-test.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/fluid-eos-test.psi.ch.key;
+
+    access_log /var/log/nginx/fluid-eos-test.access.log;
+    error_log  /var/log/nginx/fluid-eos-test.error.log;
+
+    location / {
+        autoindex on;
+        autoindex_exact_size off;
+        autoindex_localtime on;
+
+        try_files $uri $uri/ =404;
+    }
+    location ^~ /EOS/ {
+	autoindex on;
+        autoindex_exact_size off;
+        autoindex_localtime on;
+
+	try_files $uri $uri/ =404;
+    }
+}
+

conf.d/gfa-status-test.conf

@@ -12,7 +12,7 @@ server {
     ssl_certificate_key /etc/nginx/private/gfa-status-test.psi.ch.key;
 
     location / {
-        proxy_pass http://gfa-status-test:80;
+        proxy_pass http://apache_app:80;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

conf.d/opticswiki.conf

@@ -0,0 +1,24 @@
+# opticswiki conf for nginx
+# cloned from gfa-status-test.conf
+
+server {
+    listen 80;
+    server_name opticswiki.psi.ch;
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name opticswiki.psi.ch;
+
+    ssl_certificate /etc/nginx/certs/opticswiki.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/opticswiki.psi.ch.key;
+
+    location / {
+        proxy_pass http://opticswiki:80;
+        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;
+    }
+}

conf.d/panda-maintenance.conf

@@ -0,0 +1,29 @@
+server {
+    listen 80;
+    server_name panda-maintenance.psi.ch;
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name panda-maintenance.psi.ch;
+
+    ssl_certificate /etc/nginx/certs/panda-maintenance.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/panda-maintenance.psi.ch.key;
+
+
+    rewrite ^/$ /cmdbuild/ permanent;
+    location / {
+        return 404;
+    }
+
+    location /cmdbuild {
+        proxy_pass http://panda-maintenance-app:8080;
+        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;
+        # https://forum.cmdbuild.org/t/cmdbuild-behind-nginx-reverse-proxy/5070/3
+        add_header Content-Security-Policy upgrade-insecure-requests always;
+    }
+}

conf.d/rfmwtools.conf

@@ -1,18 +1,18 @@
 server {
     listen 80;
-    server_name woodpecker-test.psi.ch;
+    server_name rfmwtools-test.psi.ch;
     return 301 https://$host$request_uri;
 }
 
 server {
     listen 443 ssl;
-    server_name woodpecker-test.psi.ch;
+    server_name rfmwtools-test.psi.ch;
 
-    ssl_certificate /etc/nginx/certs/woodpecker-test.psi.ch.crt;
-    ssl_certificate_key /etc/nginx/private/woodpecker-test.psi.ch.key;
+    ssl_certificate /etc/nginx/certs/rfmwtools-test.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/rfmwtools-test.psi.ch.key;
 
     location / {
-        proxy_pass http://woodpecker_server:8000;
+        proxy_pass http://apache_app:80;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

conf.d/swiss-ecargo.conf

@@ -1,18 +1,18 @@
 server {
     listen 80;
-    server_name carculator-api-test.psi.ch;
+    server_name swiss-ecargo-api-test.psi.ch;
     return 301 https://$host$request_uri;
 }
 
 server {
     listen 443 ssl;
-    server_name carculator-api-test.psi.ch;
+    server_name swiss-ecargo-api-test.psi.ch;
 
-    ssl_certificate /etc/nginx/certs/carculator-api-test.psi.ch.crt;
-    ssl_certificate_key /etc/nginx/private/carculator-api-test.psi.ch.key;
+    ssl_certificate /etc/nginx/certs/swiss-ecargo-api-test.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/swiss-ecargo-api-test.psi.ch.key;
 
     location / {
-        proxy_pass http://carculator:8000;
+        proxy_pass http://swiss-ecargo:8000;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;