From c5e6f88adc8632af804caf3d1a4c140d2d54e42d Mon Sep 17 00:00:00 2001 From: HgO Date: Sat, 26 Dec 2020 01:48:42 +0100 Subject: [PATCH] allow multiple nginx domains --- defaults/main.yml | 1 + templates/nginx.conf.j2 | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index a4f159c..7ef4a1a 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -20,6 +20,7 @@ acme_config: mumble_web_enabled: yes mumble_web_domain: "{{ mumble_domain }}" +mumble_nginx_domains: "{{ [mumble_web_domain] }}" mumble_web_owner: mumble-web mumble_web_group: "{{ mumble_web_owner }}" mumble_web_certificate: "{{ acme_certs_dir }}/{{ mumble_web_domain }}.d/{{ acme_enabled | ternary('fullchain','cert') }}.pem" diff --git a/templates/nginx.conf.j2 b/templates/nginx.conf.j2 index b82c172..106a3a4 100644 --- a/templates/nginx.conf.j2 +++ b/templates/nginx.conf.j2 @@ -2,7 +2,7 @@ server { listen 80; listen [::]:80; - server_name {{ mumble_web_domain }}; + server_name {{ mumble_nginx_domains | join(' ') }}; location / { return 301 https://$host$request_uri; @@ -21,7 +21,7 @@ server { listen 443 ssl http2; listen [::]:443 ssl http2; - server_name {{ mumble_web_domain }}; + server_name {{ mumble_nginx_domains | join(' ') }}; ssl_certificate {{ mumble_web_certificate }}; ssl_certificate_key {{ mumble_web_private_key }};