diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4c49bd7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.env diff --git a/apache/conf/gfa-status.conf b/apache/conf/gfa-status.conf index 23bf340..ada1487 100644 --- a/apache/conf/gfa-status.conf +++ b/apache/conf/gfa-status.conf @@ -15,7 +15,7 @@ php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -fwebmaster@gfa-status.web.psi.ch" php_admin_value upload_tmp_dir /var/www/clients/client45/web70/tmp php_admin_value session.save_path /var/www/clients/client45/web70/tmp - php_admin_value open_basedir /var/www/clients/client45/web70/web:/var/www/clients/client45/web70/private:/var/www/clients/client45/web70/tmp:/var/www/gfa-status.web.psi.ch/web:/tmp:/usr/share/php:/usr/share/phpmyadmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/var/www/error/ + php_admin_value open_basedir /var/www/clients/client45/web70/web:/var/www/clients/client45/web70/private:/var/www/clients/client45/web70/tmp:/var/www/gfa-status/web:/tmp:/usr/share/php:/usr/share/phpmyadmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/var/www/error/ Options +FollowSymLinks +Includes diff --git a/conf.d/actris-test.conf b/conf.d/actris-test.conf new file mode 100644 index 0000000..156de38 --- /dev/null +++ b/conf.d/actris-test.conf @@ -0,0 +1,30 @@ +# 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 4e39411..fd91354 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -18,6 +18,7 @@ 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