diff --git a/conf.d/actris.conf b/conf.d/actris.conf deleted file mode 100644 index 34a4d80..0000000 --- a/conf.d/actris.conf +++ /dev/null @@ -1,30 +0,0 @@ -# INC0150202 Kohlbrecher Joachim & Wall Edward Owen -server { - listen 80; - server_name actris.psi.ch; - - return 301 https://$host$request_uri; -} - -server { - listen 443 ssl; - server_name actris.psi.ch; - - root /opt/webcontent/actris; - index index.html; - - ssl_certificate /etc/nginx/certs/lx-docker-dmz-01.psi.ch.crt; - ssl_certificate_key /etc/nginx/private/lx-docker-dmz-01.psi.ch.key; - - access_log /var/log/nginx/actris.access.log; - error_log /var/log/nginx/actris.error.log; - - location / { - autoindex on; - autoindex_exact_size off; - autoindex_localtime on; - - try_files $uri $uri/ =404; - } -} - diff --git a/docker-compose.yaml b/docker-compose.yaml index 2a7cd31..ef9d253 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -15,7 +15,6 @@ services: - /etc/nginx/nginx.conf:/etc/nginx/nginx.conf:ro - /etc/nginx/conf.d:/etc/nginx/conf.d:ro - /opt/webcontent/sinqstatus:/opt/webcontent/sinqstatus:ro - - /mount/actris:/opt/webcontent/actris:ro - /opt/webcontent/DMZ:/opt/webcontent/DMZ:rw networks: - public