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/opticswiki.conf b/conf.d/opticswiki.conf index a8ea359..ed7c65f 100644 --- a/conf.d/opticswiki.conf +++ b/conf.d/opticswiki.conf @@ -2,24 +2,26 @@ server { listen 80; + client_max_body_size 20M; server_name opticswiki.psi.ch; return 301 https://$host$request_uri; } server { listen 443 ssl; + client_max_body_size 20M; 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 / { + client_max_body_size 20M; 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; - # UF add proxy_set_header Cookie $http_cookie; proxy_set_header Authorization $http_authorization; } 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 6a21f73..15fd3d5 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 @@ -154,20 +154,20 @@ services: - hedgedoc_backend # Flechsig Uwe - # opticswiki (test setup) + # opticswiki # webcontent: # lx-fs-01.psi.ch:/lx_webhosting opticswiki: - image: gitea.psi.ch/images/opticswiki:1.2 + image: gitea.psi.ch/images/opticswiki:1.3 container_name: opticswiki restart: always volumes: - - /opt/webcontent/opticswiki/data:/usr/local/apache2/Foswiki-2.1.9/data - - /opt/webcontent/opticswiki/pub:/usr/local/apache2/Foswiki-2.1.9/pub - - /opt/webcontent/opticswiki/working:/usr/local/apache2/Foswiki-2.1.9/working - - /opt/webcontent/opticswiki/lib:/usr/local/apache2/Foswiki-2.1.9/lib + - /opt/webcontent/opticswiki/data:/usr/local/apache2/wiki/data + - /opt/webcontent/opticswiki/pub:/usr/local/apache2/wiki/pub + - /opt/webcontent/opticswiki/working:/usr/local/apache2/wiki/working + - /opt/webcontent/opticswiki/lib:/usr/local/apache2/wiki/lib - /opt/webcontent/opticswiki/conf:/usr/local/apache2/conf - - /opt/webcontent/opticswiki/logs:/var/log/apache2 + - /opt/webcontent/opticswiki/log:/var/log/apache2 networks: - backend