diff --git a/apache/conf/lbr-scheduler.conf b/apache/conf/lbr-scheduler.conf deleted file mode 100644 index 35d210c..0000000 --- a/apache/conf/lbr-scheduler.conf +++ /dev/null @@ -1,15 +0,0 @@ - - ServerName lbr-scheduler.psi.ch - DocumentRoot /var/www/lbr-scheduler - - - Options FollowSymLinks - AllowOverride All - Order allow,deny - Allow from all - - - ErrorLog /proc/self/fd/2 - CustomLog /proc/self/fd/1 combined - - diff --git a/conf.d/actris-test.conf b/conf.d/actris-test.conf deleted file mode 100644 index 156de38..0000000 --- a/conf.d/actris-test.conf +++ /dev/null @@ -1,30 +0,0 @@ -# INC0150202 Kohlbrecher Joachim & Wall Edward Owen -server { - listen 80; - server_name actris-test.psi.ch; - - return 301 https://$host$request_uri; -} - -server { - listen 443 ssl; - server_name actris-test.psi.ch; - - root /opt/webcontent/actris-test; - index index.html; - - ssl_certificate /etc/nginx/certs/actris-test.psi.ch.crt; - ssl_certificate_key /etc/nginx/private/actris-test.psi.ch.key; - - access_log /var/log/nginx/actris-test.access.log; - error_log /var/log/nginx/actris-test.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 f45695f..991e3f3 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -18,7 +18,6 @@ services: - /etc/nginx/nginx.conf:/etc/nginx/nginx.conf:ro - /etc/nginx/conf.d:/etc/nginx/conf.d:ro - /opt/webcontent/sinqstatus-test:/opt/webcontent/sinqstatus-test:ro - - /mount/actris:/opt/webcontent/actris-test:ro - /opt/webcontent/it-strategy-dashboard/frontend/:/opt/webcontent/it-strategy-dashboard/:ro networks: - public @@ -38,7 +37,6 @@ services: - /opt/webcontent/fluid-eos:/var/www/fluid-eos:rw - /opt/webcontent/sls2:/var/www/sls2:rw - /opt/webcontent/megwiki:/var/www/megwiki:rw - - /opt/webcontent/lbr-scheduler:/var/www/lbr-scheduler:rw - /mount/srem/webhosting:/var/www/srem:rw - ./apache/conf:/etc/apache2/sites-enabled:ro networks: