From d38be16526ad70e8d2a508189e26a6a01052e562 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud
Date: Tue, 17 Mar 2015 22:22:56 +0100
Subject: [PATCH] Remove the signaling URI settings it now can be determined
automatically
---
conf/settings.ini.dist | 4 ----
templates/default/documentation.html.ep | 13 -------------
vroom.pl | 2 +-
3 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/conf/settings.ini.dist b/conf/settings.ini.dist
index 8fc6436..c2b62d6 100644
--- a/conf/settings.ini.dist
+++ b/conf/settings.ini.dist
@@ -4,10 +4,6 @@
;user = 'vroom'
;password = 'password'
-[signaling]
-; URI sent to clients where they can find the signaling server
-;uri = 'https://vroom.exmple.com'
-
[turn]
; The stun server sent to client. You can set it to your own stun server. Takes a comma separated list of full
; stun uri as defined by rfc7064
diff --git a/templates/default/documentation.html.ep b/templates/default/documentation.html.ep
index ed9ce6f..6a0d913 100644
--- a/templates/default/documentation.html.ep
+++ b/templates/default/documentation.html.ep
@@ -280,19 +280,6 @@ cp /opt/vroom/conf/settings.ini.dist /opt/vroom/conf/settings.ini
-
- signaling
-
-
- This section is where you define your signaling server settings.
- This is because VROOM was using a modified SignalMaster
- as signaling server, which could run on a separate server. Now, the signaling server is directly included in VROOM daemon
- so this section might be removed in the future
-
- - uri: The uri to reach VROOM (/socket.io will be added to reach the SocketIO server)
-
-
-
turn
diff --git a/vroom.pl b/vroom.pl
index dea7750..301eb45 100755
--- a/vroom.pl
+++ b/vroom.pl
@@ -1743,7 +1743,7 @@ any '/api' => sub {
# Return configuration for SimpleWebRTC
elsif ($req->{action} eq 'get_rtc_conf'){
my $resp = {
- url => $config->{'signaling.uri'},
+ url => Mojo::URL->new($self->url_for('/')->to_abs)->scheme('https'),
peerConnectionConfig => {
iceServers => []
},