Merge pull request 'megiwiki run on apache php infra' (#31) from megwiki into main

Reviewed-on: linux/WebHosting#31
This commit is contained in:
2026-01-19 15:23:25 +01:00
committed by Gitea
3 changed files with 36 additions and 0 deletions

View File

@@ -0,0 +1,14 @@
<VirtualHost *:80>
ServerName megwiki-test.psi.ch
DocumentRoot /var/www/megwiki
<Directory /var/www/megwiki>
Options FollowSymLinks
AllowOverride All
Require all granted
</Directory>
ErrorLog /proc/self/fd/2
CustomLog /proc/self/fd/1 combined
</VirtualHost>

View File

@@ -0,0 +1,21 @@
server {
listen 80;
server_name megwiki-test.psi.ch;
return 301 https://$host$request_uri;
}
server {
listen 443 ssl;
server_name megwiki-test.psi.ch;
ssl_certificate /etc/nginx/certs/megwiki-test.psi.ch.crt;
ssl_certificate_key /etc/nginx/private/megwiki-test.psi.ch.key;
location / {
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;
proxy_set_header X-Forwarded-Proto $scheme;
}
}

View File

@@ -37,6 +37,7 @@ services:
- /opt/webcontent/gfa-status:/var/www/gfa-status:rw
- /opt/webcontent/fluid-eos:/var/www/fluid-eos:rw
- /opt/webcontent/sls2:/var/www/sls2:rw
- /opt/webcontent/megwiki:/var/www/megwiki:rw
- /mount/srem/webhosting:/var/www/srem:rw
- ./apache/conf:/etc/apache2/sites-enabled:ro
networks: