From 30d853386d81700c4937d11ffa00f8fa89d22e47 Mon Sep 17 00:00:00 2001 From: Armin Co <armin.co@hs-bochumde> Date: Fri, 23 Oct 2020 15:36:16 +0200 Subject: [PATCH] Update --- docker-compose.production.yml | 5 ++-- murmur/mumble-server.ini | 2 +- webserver/conf/mumble-web.subdomain.conf | 30 ++++++++++++++++++++++++ webserver/entrypoint.sh | 0 4 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 webserver/conf/mumble-web.subdomain.conf mode change 100755 => 100644 webserver/entrypoint.sh diff --git a/docker-compose.production.yml b/docker-compose.production.yml index 2f57d8c..8c7c71c 100644 --- a/docker-compose.production.yml +++ b/docker-compose.production.yml @@ -22,6 +22,5 @@ services: - 64738:64738/udp volumes: - /etc/localtime:/etc/localtime:ro - # - ./murmur:/opt/murmur/config - - ./reverse_proxy/keys/letsencrypt:/opt/murmur/cert - restart: unless-stopped \ No newline at end of file + - ./reverse_proxy/keys/letsencrypt/:/opt/murmur/cert + restart: unless-stopped diff --git a/murmur/mumble-server.ini b/murmur/mumble-server.ini index 4c09b45..c77d757 100644 --- a/murmur/mumble-server.ini +++ b/murmur/mumble-server.ini @@ -72,7 +72,7 @@ icesecretwrite= # logs to the file 'murmur.log'. If you leave this field blank # on Unix-like systems, Murmur will force itself into foreground # mode which logs to the console. -logfile=/data/mumble-server.log +logfile= # If set, Murmur will write its process ID to this file # when running in daemon mode (when the -fg flag is not diff --git a/webserver/conf/mumble-web.subdomain.conf b/webserver/conf/mumble-web.subdomain.conf new file mode 100644 index 0000000..fcd8f87 --- /dev/null +++ b/webserver/conf/mumble-web.subdomain.conf @@ -0,0 +1,30 @@ +server { + listen 443 ssl; + listen [::]:443 ssl; + + server_name mumble.*; + + include /config/nginx/ssl.conf; + + client_max_body_size 0; + + location / { + include /config/nginx/proxy.conf; + resolver 127.0.0.11 valid=30s; + set $upstream_mumble mumble; + proxy_max_temp_file_size 2048m; + proxy_pass https://$upstream_mumble:4436; + } + + location /cvh { + proxy_pass http://localhost:64737; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + } +} + +map $http_upgrade $connection_upgrade { + default upgrade; + '' close; +} \ No newline at end of file diff --git a/webserver/entrypoint.sh b/webserver/entrypoint.sh old mode 100755 new mode 100644 -- GitLab