diff --git a/apache/conf/omny.conf b/apache/conf/omny.conf new file mode 100644 index 0000000..284416c --- /dev/null +++ b/apache/conf/omny.conf @@ -0,0 +1,11 @@ + + ServerName omny-test.psi.ch + DocumentRoot /var/www/omny + + + Options +ExecCGI + AllowOverride None + Require all granted + + + diff --git a/conf.d/omny.conf b/conf.d/omny.conf new file mode 100644 index 0000000..657b76e --- /dev/null +++ b/conf.d/omny.conf @@ -0,0 +1,25 @@ +# omny-test conf for nginx + +server { + listen 80; + server_name omny-test.psi.ch; + return 301 https://$host$request_uri; +} + +server { + listen 443 ssl; + server_name omny-test.psi.ch; + + ssl_certificate /etc/nginx/certs/omny-test.psi.ch.crt; + ssl_certificate_key /etc/nginx/private/omny-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; + proxy_set_header Cookie $http_cookie; + proxy_set_header Authorization $http_authorization; + } +} diff --git a/docker-compose.yaml b/docker-compose.yaml index c0861ed..a0ba404 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -38,6 +38,7 @@ services: - /opt/webcontent/sls2:/var/www/sls2:rw - /opt/webcontent/megwiki:/var/www/megwiki:rw - /opt/webcontent/niagadm:/var/www/niagadm:rw + - /opt/webcontent/omny:/var/www/omny:rw - /mount/srem/webhosting:/var/www/srem:rw - ./apache/conf:/etc/apache2/sites-enabled:ro networks: