forked from linux/WebHosting
Merge pull request 'remove obsolete stuff' (#37) from cleanup into main
Reviewed-on: linux/WebHosting#37
This commit is contained in:
@@ -1,15 +0,0 @@
|
||||
<VirtualHost *:80>
|
||||
ServerName lbr-scheduler.psi.ch
|
||||
DocumentRoot /var/www/lbr-scheduler
|
||||
|
||||
<Directory /var/www/lbr-scheduler>
|
||||
Options FollowSymLinks
|
||||
AllowOverride All
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</Directory>
|
||||
|
||||
ErrorLog /proc/self/fd/2
|
||||
CustomLog /proc/self/fd/1 combined
|
||||
</VirtualHost>
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user