Adjust mumble_web_ssl* vars

systemli · May 3, 2020 · 93eb4d3 · 93eb4d3
1 parent 803995a
commit 93eb4d3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -79,7 +79,7 @@ Role Variables
   #   - letsencrypt
   mumble_web_listen: "443"
   mumble_web_ssl_activated: True
-  mumble_web_ssl_target: False
+  mumble_web_ssl_target: True
 ```
 
 Download

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -68,4 +68,4 @@ mumble_web_config: ""
 
 mumble_web_listen: "443"
 mumble_web_ssl_activated: True
-mumble_web_ssl_target: False
+mumble_web_ssl_target: True
diff --git a/templates/mumble-web.service.j2 b/templates/mumble-web.service.j2
@@ -4,8 +4,12 @@ Description=Mumble-web
 [Service]
 SyslogIdentifier=mumble-web
 ExecStart=/usr/bin/python2.7 /usr/bin/python2-websockify \
-  {% if mumble_web_ssl_activated %}--cert={{ murmur_sslcert }} --key={{ murmur_sslkey }} --ssl-only  --ssl-target \
-  {% elif mumble_web_ssl_target %}--ssl-target {% endif %}
+{% if mumble_web_ssl_activated %}
+  --cert={{ murmur_sslcert }} --key={{ murmur_sslkey }} --ssl-only \
+{% endif %}
+{% if mumble_web_ssl_target %}
+  --ssl-target \
+{% endif %}
   --web={{ mumble_web_path }}/dist {{ mumble_web_listen }} localhost:{{ murmur_port }}
 DynamicUser=true
 ; we need access to the certs