From 90ed5b652499370b1a33d0c08743ee14d8c8637b Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Mon, 31 Oct 2016 11:40:55 +0100 Subject: [PATCH] Update murmur.ini.tmpl --- rootfs/etc/confd/templates/murmur.ini.tmpl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rootfs/etc/confd/templates/murmur.ini.tmpl b/rootfs/etc/confd/templates/murmur.ini.tmpl index d795600..58174dd 100644 --- a/rootfs/etc/confd/templates/murmur.ini.tmpl +++ b/rootfs/etc/confd/templates/murmur.ini.tmpl @@ -85,7 +85,7 @@ pidfile=/var/run/murmur/murmur.pid # configure it here than through D-Bus or Ice. # # Welcome message sent to clients when they connect. -welcometext="{{getenv "WELCOMETEXT"}}" +welcometext="{{getenv "WELCOME_TEXT"}}" # Port to bind TCP and UDP sockets to. port=64738 @@ -95,14 +95,14 @@ port=64738 #host= # Password to join server. -serverpassword={{getenv "SERVERPASSWORD"}} +serverpassword={{getenv "SERVER_PASSWORD"}} # Maximum bandwidth (in bits per second) clients are allowed # to send speech at. -bandwidth={{getenv "MAXBANDWIDTH"}} +bandwidth={{getenv "MAX_BANDWIDTH" "72000"}} # Maximum number of concurrent clients allowed. -users={{getenv "MAXUSERS"}} +users={{getenv "MAX_USERS" "20"}} # Amount of users with Opus support needed to force Opus usage, in percent. # 0 = Always enable Opus, 100 = enable Opus if it's supported by all clients. @@ -157,8 +157,8 @@ users={{getenv "MAXUSERS"}} # If you have a proper SSL certificate, you can provide the filenames here. # Otherwise, Murmur will create it's own certificate automatically. -sslCert=/etc/ssl/murmur/fullchain.pem -sslKey=/etc/ssl/murmur/privkey.pem +sslCert=/etc/ssl/murmur/{{getenv "CERT_NAME" "fullchain.pem"}} +sslKey=/etc/ssl/murmur/{{getenv "KEY_NAME" "privkey.pem"}} # The sslCiphers option chooses the cipher suites to make available for use # in SSL/TLS. This option is server-wide, and cannot be set on a @@ -196,4 +196,4 @@ uname=murmur # [Ice] Ice.Warn.UnknownProperties=1 -Ice.MessageSizeMax=65536 \ No newline at end of file +Ice.MessageSizeMax=65536