diff --git a/apache/conf/sls2.conf b/apache/conf/sls2.conf new file mode 100644 index 0000000..5b5b68b --- /dev/null +++ b/apache/conf/sls2.conf @@ -0,0 +1,14 @@ + + ServerName sls2.psi.ch + DocumentRoot /var/www/sls2 + + Options +Includes + + + Options +Includes + AllowOverride None + Require all granted + + + + diff --git a/conf.d/sls2.conf b/conf.d/sls2.conf new file mode 100644 index 0000000..ef83143 --- /dev/null +++ b/conf.d/sls2.conf @@ -0,0 +1,27 @@ +server { + listen 80; + server_name sls2.psi.ch; + + return 301 https://$host$request_uri; +} + +server { + listen 443 ssl; + server_name sls2.psi.ch; + + ssl_certificate /etc/nginx/certs/sls2.psi.ch.crt; + ssl_certificate_key /etc/nginx/private/sls2.psi.ch.key; + + access_log /var/log/nginx/sls2.access.log; + error_log /var/log/nginx/sls2.error.log; + + 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; + + } +} + diff --git a/docker-compose.yaml b/docker-compose.yaml index a400aed..a2db3dd 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -36,10 +36,7 @@ services: - /mount/srem/webhosting:/var/www/srem:rw - /opt/webcontent/gfa-status:/var/www/gfa-status:rw - /opt/webcontent/fluid-eos:/var/www/fluid-eos:rw - - ./apache/conf/rfmwtools.conf:/etc/apache2/sites-enabled/rfmwtools.conf:ro - - ./apache/conf/srem.conf:/etc/apache2/sites-enabled/srem.conf:ro - - ./apache/conf/gfa-status.conf:/etc/apache2/sites-enabled/gfa-status.conf:ro - - ./apache/conf/fluid-eos.conf:/etc/apache2/sites-enabled/fluid-eos.conf:ro + - ./apache/conf:/etc/apache2/sites-enabled:ro networks: - backend