From aa278534daee2950785757a54044d8d46eb6b98f Mon Sep 17 00:00:00 2001 From: Markus Hauschild Date: Wed, 17 Jun 2020 23:46:07 +0200 Subject: [PATCH] web-svc: tiles: remove unused extra domains --- roles/web-svc/templates/tiles_certs.j2 | 2 +- roles/web-svc/templates/tiles_vhost.j2 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/web-svc/templates/tiles_certs.j2 b/roles/web-svc/templates/tiles_certs.j2 index 279409b..3abb4b6 100644 --- a/roles/web-svc/templates/tiles_certs.j2 +++ b/roles/web-svc/templates/tiles_certs.j2 @@ -1,6 +1,6 @@ --- -{{ domain }} 1.omt.regensburg.freifunk.net 2.omt.regensburg.freifunk.net 3.omt.regensburg.freifunk.net 4.omt.regensburg.freifunk.net: +{{ domain }}: - path: /etc/nginx/ssl/{{ domain }}.crt user: root group: root diff --git a/roles/web-svc/templates/tiles_vhost.j2 b/roles/web-svc/templates/tiles_vhost.j2 index 9302fc3..a805e76 100644 --- a/roles/web-svc/templates/tiles_vhost.j2 +++ b/roles/web-svc/templates/tiles_vhost.j2 @@ -2,7 +2,7 @@ server { listen 80; listen [::]:80; - server_name {{ domain }} 1.omt.regensburg.freifunk.net 2.omt.regensburg.freifunk.net 3.omt.regensburg.freifunk.net 4.omt.regensburg.freifunk.net; + server_name {{ domain }}; location /.well-known/acme-challenge { default_type "text/plain"; @@ -20,7 +20,7 @@ server { listen 443 ssl http2; listen [::]:443 ssl http2; - server_name {{ domain }} 1.omt.regensburg.freifunk.net 2.omt.regensburg.freifunk.net 3.omt.regensburg.freifunk.net 4.omt.regensburg.freifunk.net; + server_name {{ domain }}; ssl_certificate_key /etc/nginx/ssl/{{ domain }}.key; ssl_certificate /etc/nginx/ssl/{{ domain }}.crt;