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

replace nginx with caddy2

Browse Source
This commit is contained in:
HgO
2021-03-28 10:48:06 +02:00
parent 7bb919e184
commit 66b27f9087
18 changed files with 254 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
templates/mumble-web/Caddyfile.j2 Normal file
View File

@@ -0,0 +1,14 @@
{{ ansible_managed | comment }}
{{ mumble_web_domains | join(',') }} {
root * {{ mumble_web_dist_dir }}
file_server
{% if not acme_enabled %}
tls internal
{% endif %}
reverse_proxy /mumble http://localhost:{{ mumble_web_websockify_port }}
log {
output file {{ caddy_log_dir }}/{{ mumble_web_domains | first }}.log
}
}

2
templates/mumble-web/config.js.j2
View File

@@ -20,4 +20,4 @@ config.connectDialog.password = {{ (murmur_server_password != '') | lower }}
config.settings.pttKey = 'shift'
// Default values (can be changed by passing a query parameter of the same name)
config.defaults.address = "{{ mumble_web_domain }}/mumble"
config.defaults.address = "{{ mumble_web_domains | first }}/mumble"

16
templates/mumble-web/nginx.conf.j2
View File

@@ -2,7 +2,7 @@
server {
listen 80;
listen [::]:80;
server_name {{ mumble_web_nginx_domains | join(' ') }};
server_name {{ mumble_web_domains | join(' ') }};
location / {
return 301 https://$host$request_uri;
@@ -16,15 +16,15 @@ server {
}
{% endif %}
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;
access_log {{ nginx_log_dir }}/{{ mumble_web_domains | first }}-access.log;
error_log {{ nginx_log_dir }}/{{ mumble_web_domains | first }}-error.log;
}
server {
listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name {{ mumble_web_nginx_domains | join(' ') }};
server_name {{ mumble_web_domains | join(' ') }};
ssl_certificate {{ mumble_web_certificate }};
ssl_certificate_key {{ mumble_web_private_key }};
@@ -33,8 +33,8 @@ server {
ssl_session_cache shared:AnsibleSSL:10m; # about 40000 sessions
ssl_session_tickets off;
{% if mumble_web_nginx_dhparam %}
ssl_dhparam {{ mumble_web_nginx_dhparam }};
{% if nginx_dhparam %}
ssl_dhparam {{ nginx_dhparam }};
{% endif %}
ssl_protocols TLSv1.2 TLSv1.3;
@@ -63,8 +63,8 @@ server {
proxy_set_header Connection $connection_upgrade;
}
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;
access_log {{ nginx_log_dir }}/{{ mumble_web_domains | first }}-access.log;
error_log {{ nginx_log_dir }}/{{ mumble_web_domains | first }}-error.log;
}
map $http_upgrade $connection_upgrade {