diff --git a/Makefile b/Makefile index b21f3c4..3f97d8e 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ compress: docker-compose exec web ./manage.py collectstatic --noinput -i media docker-compose exec web ./manage.py compress -release: rebuild compress run +release: rebuild run compress restart reindex: docker-compose exec web ./manage.py update_index diff --git a/ansible/templates/web/extra-public-health.conf b/ansible/templates/web/extra-public-health.conf new file mode 100644 index 0000000..4dd4ac0 --- /dev/null +++ b/ansible/templates/web/extra-public-health.conf @@ -0,0 +1,31 @@ +# Web archive and other special configurations +server { + server_name www-old.public-health.ch; + listen 443 ssl; + return 301 http://$server_name$request_uri; +} +server { + server_name www-old.public-health.ch; + listen 80; + index index.html index.htm; + root /opt/www-old; + add_after_body /archive-message.html; + location = /archive-message.html { + root /opt/publichealth/static/org/; + } + location / { + try_files $uri $uri/ =404; + } +} + +# Conference subdomain +server { + server_name conference.public-health.ch; + listen 443 ssl; + return 301 https://sphc.ch; +} +server { + server_name conference.public-health.ch; + listen 80; + return 301 https://sphc.ch; +}