Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikkel Krautz <mikkel@krautz.dk>2017-07-23 14:38:36 +0300
committerMikkel Krautz <mikkel@krautz.dk>2017-07-23 14:43:11 +0300
commit863cb3b3391cf1d38a676b945443533e04de3a6b (patch)
tree1b7b6d3b7e9d259fd61c660ccf34fa9371374966 /scripts/murmur.ini
parent38c525ed16d5ed8e9dd4bb8f3af73f4af6363679 (diff)
scripts: remove gRPC-specific murmur.ini.
Let's merge the two, and note in the .ini that not all builds contain gRPC support.
Diffstat (limited to 'scripts/murmur.ini')
-rw-r--r--scripts/murmur.ini10
1 files changed, 10 insertions, 0 deletions
diff --git a/scripts/murmur.ini b/scripts/murmur.ini
index 159248cbf..0bd585153 100644
--- a/scripts/murmur.ini
+++ b/scripts/murmur.ini
@@ -79,6 +79,16 @@ ice="tcp -h 127.0.0.1 -p 6502"
;icesecretread=
icesecretwrite=
+; If you want to expose Murmur's experimental grPC API, you
+; need to specify an address to bind on.
+; Note: not all builds of Murmur support gRPC. If gRPC is not
+; available, Murmur will warn you in its log output.
+;grpc="127.0.0.1:50051"
+; Specifying both a certificate and key file below will cause gRPC to use
+; secured, TLS connections.
+;grpccert=""
+;grpckey=""
+
; How many login attempts do we tolerate from one IP
; inside a given timeframe before we ban the connection?
; Note that this is global (shared between all virtual servers), and that