PPBe
/
ansible-role-mumble
3
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

rename variables

master
HgO 2021-03-26 18:06:25 +01:00
parent 698f1ee1e3
commit ea80f2e2f5
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@ -13,8 +13,6 @@ acme_directory_url: https://acme-v02.api.letsencrypt.org/directory
mumble_web_enabled: no mumble_web_enabled: no
mumble_web_domain: "{{ mumble_domain }}" mumble_web_domain: "{{ mumble_domain }}"
mumble_nginx_domains:
- "{{ mumble_web_domain }}"
mumble_web_owner: mumble-web mumble_web_owner: mumble-web
mumble_web_group: "{{ mumble_web_owner }}" mumble_web_group: "{{ mumble_web_owner }}"
mumble_web_certificate: "{{ acme_certs_dir }}/{{ mumble_web_domain }}.d/{{ acme_enabled | ternary('fullchain','cert') }}.pem" 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_websockify_port: "64737"
mumble_web_nginx_enabled: yes mumble_web_nginx_enabled: yes
mumble_web_nginx_domains:
- "{{ mumble_web_domain }}"
mumble_web_nginx_config_dir: /etc/nginx mumble_web_nginx_config_dir: /etc/nginx
mumble_web_nginx_log_dir: /var/log/nginx mumble_web_nginx_log_dir: /var/log/nginx
mumble_web_nginx_generate_dhparam: yes mumble_web_nginx_generate_dhparam: yes

12
templates/nginx.conf.j2
View File

@ -2,7 +2,7 @@
server { server {
listen 80; listen 80;
listen [::]:80; listen [::]:80;
server_name {{ mumble_nginx_domains | join(' ') }}; server_name {{ mumble_web_nginx_domains | join(' ') }};
location / { location / {
return 301 https://$host$request_uri; return 301 https://$host$request_uri;
@ -16,15 +16,15 @@ server {
} }
{% endif %} {% endif %}
access_log {{ mumble_nginx_log_dir }}/{{ mumble_nginx_domains | first }}-access.log; access_log {{ mumble_web_nginx_log_dir }}/{{ mumble_web_nginx_domains | first }}-access.log;
error_log {{ mumble_nginx_log_dir }}/{{ mumble_nginx_domains | first }}-error.log; error_log {{ mumble_web_nginx_log_dir }}/{{ mumble_web_nginx_domains | first }}-error.log;
} }
server { server {
listen 443 ssl http2; listen 443 ssl http2;
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 {{ mumble_web_certificate }};
ssl_certificate_key {{ mumble_web_private_key }}; ssl_certificate_key {{ mumble_web_private_key }};
@ -63,8 +63,8 @@ server {
proxy_set_header Connection $connection_upgrade; proxy_set_header Connection $connection_upgrade;
} }
access_log {{ mumble_nginx_log_dir }}/{{ mumble_nginx_domains | first }}-access.log; access_log {{ mumble_web_nginx_log_dir }}/{{ mumble_web_nginx_domains | first }}-access.log;
error_log {{ mumble_nginx_log_dir }}/{{ mumble_nginx_domains | first }}-error.log; error_log {{ mumble_web_nginx_log_dir }}/{{ mumble_web_nginx_domains | first }}-error.log;
} }
map $http_upgrade $connection_upgrade { map $http_upgrade $connection_upgrade {