Logo size reduced, server config

ansible/roles/web/templates/nginx.conf.j2

@@ -6,25 +6,24 @@ upstream wagtail-site {
 	server localhost:5000;
 }
 server {
-	listen [::]:80 default_server;
+  listen 80 default_server;
-	listen 80 default_server;
+	server_name _;
-	server_name {{ domain }};
-	return 301 https://$server_name$request_uri;
-}
-server {
-	listen 80;
-	server_name sphc.ch ngo-allianz-ebk.ch;
-	return 301 https://$server_name$request_uri;
-}
-server {
-	listen [::]:443;
-	listen 443 ssl;
-	server_name {{ domain }} sphc.ch ngo-allianz-ebk.ch;
 
+	location / {
+		proxy_set_header  X-Real-IP $remote_addr;
+		proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
+		proxy_set_header Host $http_host;
+		proxy_redirect off;
+		proxy_pass http://wagtail-site;
+	}
+}
+server {
+	listen 443 ssl default_server;
+	server_name _;
+	
 	ssl on;
-	ssl_certificate /etc/letsencrypt/live/{{ domain }}/fullchain.pem;
+	ssl_certificate /etc/certs/public-health.ch/cloudflare.pem;
-	ssl_certificate_key /etc/letsencrypt/live/{{ domain }}/privkey.pem;
+	ssl_certificate_key /etc/certs/public-health.ch/cloudflare.key;
-	include /etc/letsencrypt/options-ssl-nginx.conf;
 
 	client_max_body_size 16M;
 

ansible/roles/web/templates/ph-extra-nginx.conf.j2

@@ -3,18 +3,14 @@
 # Web archive and other special configurations
 
 server {
-	listen 80;
 	server_name www-old.{{ domain }};
-	return 301 https://$server_name$request_uri;
-}
-server {
 	listen 443 ssl;
-	server_name www-old.{{ domain }};
+	return 301 http://$server_name$request_uri;
-	ssl on;
+}
-	ssl_certificate /etc/letsencrypt/live/{{ domain }}/fullchain.pem;
-	ssl_certificate_key /etc/letsencrypt/live/{{ domain }}/privkey.pem;
-	include /etc/letsencrypt/options-ssl-nginx.conf;
 
+server {
+	server_name www-old.{{ domain }};
+	listen 80;
 	index index.html index.htm;
 	root {{ archive_dir }};
 	add_after_body /archive-message.html;
@@ -25,30 +21,3 @@ server {
 		try_files $uri $uri/ =404;
 	}
 }
-
-server {
-	listen 80;
-	server_name conference.{{ domain }};
-
-	location /fr {
-		return 301 $scheme://sph17.organizers-congress.org/frontend/index.php?sub=89;
-	}
-	location / {
-		return 301 $scheme://sph17.organizers-congress.org;
-	}
-}
-server {
-	listen 443 ssl;
-	server_name conference.{{ domain }};
-	ssl on;
-	ssl_certificate /etc/letsencrypt/live/{{ domain }}/fullchain.pem;
-	ssl_certificate_key /etc/letsencrypt/live/{{ domain }}/privkey.pem;
-	include /etc/letsencrypt/options-ssl-nginx.conf;
-
-	location /fr {
-		return 301 $scheme://sph17.organizers-congress.org/frontend/index.php?sub=89;
-	}
-	location / {
-		return 301 $scheme://sph17.organizers-congress.org;
-	}
-}