From ea80f2e2f56edf7605c51a23cabd0d474fe18bdc Mon Sep 17 00:00:00 2001
From: HgO <hgo@batato.be>
Date: Fri, 26 Mar 2021 18:06:25 +0100
Subject: [PATCH] rename variables

---
 defaults/main.yml       |  4 ++--
 templates/nginx.conf.j2 | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index adfc571..4bb831c 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -13,8 +13,6 @@ acme_directory_url: https://acme-v02.api.letsencrypt.org/directory
 
 mumble_web_enabled: no
 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"
@@ -25,6 +23,8 @@ mumble_web_version: master
 mumble_web_websockify_port: "64737"
 
 mumble_web_nginx_enabled: yes
+mumble_web_nginx_domains: 
+  - "{{ mumble_web_domain }}"
 mumble_web_nginx_config_dir: /etc/nginx
 mumble_web_nginx_log_dir: /var/log/nginx
 mumble_web_nginx_generate_dhparam: yes
diff --git a/templates/nginx.conf.j2 b/templates/nginx.conf.j2
index 75573f8..107f284 100644
--- a/templates/nginx.conf.j2
+++ b/templates/nginx.conf.j2
@@ -2,7 +2,7 @@
 server {
   listen 80;
   listen [::]:80;
-  server_name {{ mumble_nginx_domains | join(' ') }};
+  server_name {{ mumble_web_nginx_domains | join(' ') }};
 
   location / {
     return 301 https://$host$request_uri;
@@ -16,15 +16,15 @@ server {
 	}
 {% endif %}
 
-  access_log {{ mumble_nginx_log_dir }}/{{ mumble_nginx_domains | first }}-access.log;
-  error_log {{ mumble_nginx_log_dir }}/{{ mumble_nginx_domains | first }}-error.log;
+  access_log {{ mumble_web_nginx_log_dir }}/{{ mumble_web_nginx_domains | first }}-access.log;
+  error_log {{ mumble_web_nginx_log_dir }}/{{ mumble_web_nginx_domains | first }}-error.log;
 }
 
 server {
   listen 443 ssl http2;
   listen [::]:443 ssl http2;
 
-  server_name {{ mumble_nginx_domains | join(' ') }};
+  server_name {{ mumble_web_nginx_domains | join(' ') }};
 
   ssl_certificate {{ mumble_web_certificate }};
   ssl_certificate_key {{ mumble_web_private_key }};
@@ -63,8 +63,8 @@ server {
     proxy_set_header Connection $connection_upgrade;
   }
 
-  access_log {{ mumble_nginx_log_dir }}/{{ mumble_nginx_domains | first }}-access.log;
-  error_log {{ mumble_nginx_log_dir }}/{{ mumble_nginx_domains | first }}-error.log;
+  access_log {{ mumble_web_nginx_log_dir }}/{{ mumble_web_nginx_domains | first }}-access.log;
+  error_log {{ mumble_web_nginx_log_dir }}/{{ mumble_web_nginx_domains | first }}-error.log;
 }
 
 map $http_upgrade $connection_upgrade {