From 00cb196e95cff8c7fdfc4f04cc3cadc3d765eeef Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Mon, 19 Jan 2026 15:22:54 +0100 Subject: [PATCH] megiwiki run on apache php infra Signed-off-by: Basil Bruhn --- apache/conf/megwiki-test.conf | 14 ++++++++++++++ conf.d/megwiki-test.psi.ch | 21 +++++++++++++++++++++ docker-compose.yaml | 1 + 3 files changed, 36 insertions(+) create mode 100644 apache/conf/megwiki-test.conf create mode 100644 conf.d/megwiki-test.psi.ch diff --git a/apache/conf/megwiki-test.conf b/apache/conf/megwiki-test.conf new file mode 100644 index 0000000..78ed878 --- /dev/null +++ b/apache/conf/megwiki-test.conf @@ -0,0 +1,14 @@ + + ServerName megwiki-test.psi.ch + DocumentRoot /var/www/megwiki + + + Options FollowSymLinks + AllowOverride All + Require all granted + + + ErrorLog /proc/self/fd/2 + CustomLog /proc/self/fd/1 combined + + diff --git a/conf.d/megwiki-test.psi.ch b/conf.d/megwiki-test.psi.ch new file mode 100644 index 0000000..5b14dc0 --- /dev/null +++ b/conf.d/megwiki-test.psi.ch @@ -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; + } +} diff --git a/docker-compose.yaml b/docker-compose.yaml index 6c701b9..406a37d 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -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: