diff --git a/html/head.html b/html/head.html
index 126b9b30..d8e18268 100644
--- a/html/head.html
+++ b/html/head.html
@@ -1,4 +1,4 @@
-<%define "head"%>
Spreed Speak Freely
+<%define "head"%><%.Cfg.Title%>
diff --git a/html/logo.html b/html/logo.html
index 9373e23d..58bfa6ea 100644
--- a/html/logo.html
+++ b/html/logo.html
@@ -1 +1 @@
-<%define "logo"%>Speak Freely<%end%>
\ No newline at end of file
+<%define "logo"%>Speak Freely<%end%>
\ No newline at end of file
diff --git a/server.conf.in b/server.conf.in
index ac353cee..418da8c1 100644
--- a/server.conf.in
+++ b/server.conf.in
@@ -7,6 +7,7 @@ listen = 127.0.0.1:8080
#writetimeout = 10
[app]
+#title = Spreed Speak Freely
#ver = 1234 # version string to use for static resource
#stunURIs = stun.l.google.com:19302
#turnURIs = turn:turnserver:port?transport=udp turn:anotherturnserver:port?transport=tcp turns:turnserver:443?transport=tcp
diff --git a/src/app/spreed-speakfreely-server/config.go b/src/app/spreed-speakfreely-server/config.go
index 85b6e3f0..fc0c1c20 100644
--- a/src/app/spreed-speakfreely-server/config.go
+++ b/src/app/spreed-speakfreely-server/config.go
@@ -25,6 +25,7 @@ import (
)
type Config struct {
+ Title string // Title
ver string // Version (not exported to Javascript)
S string // Static URL prefix with version
StunURIs []string // STUN server URIs
@@ -34,7 +35,7 @@ type Config struct {
globalRoomid string // Id of the global room (not exported to Javascript)
}
-func NewConfig(ver, runtimeVersion string, stunURIs, turnURIs []string, tokens bool, globalRoomid string) *Config {
+func NewConfig(title, ver, runtimeVersion string, stunURIs, turnURIs []string, tokens bool, globalRoomid string) *Config {
sv := fmt.Sprintf("static/ver=%s", ver)
- return &Config{ver: ver, S: sv, StunURIs: stunURIs, TurnURIs: turnURIs, Tokens: tokens, Version: runtimeVersion, globalRoomid: globalRoomid}
+ return &Config{Title: title, ver: ver, S: sv, StunURIs: stunURIs, TurnURIs: turnURIs, Tokens: tokens, Version: runtimeVersion, globalRoomid: globalRoomid}
}
diff --git a/src/app/spreed-speakfreely-server/main.go b/src/app/spreed-speakfreely-server/main.go
index d6914e23..1373f1e9 100644
--- a/src/app/spreed-speakfreely-server/main.go
+++ b/src/app/spreed-speakfreely-server/main.go
@@ -155,6 +155,11 @@ func runner(runtime phoenix.Runtime) error {
}
}
+ title, err := runtime.GetString("app", "title")
+ if err != nil {
+ title = "Spreed Speak Freely"
+ }
+
ver, err := runtime.GetString("app", "ver")
if err != nil {
ver = ""
@@ -208,7 +213,7 @@ func runner(runtime phoenix.Runtime) error {
}
// Create configuration data structure.
- config = NewConfig(ver, runtimeVersion, stunURIs, turnURIs, tokenProvider != nil, globalRoomid)
+ config = NewConfig(title, ver, runtimeVersion, stunURIs, turnURIs, tokenProvider != nil, globalRoomid)
// Load templates.
tt := template.New("")
@@ -221,7 +226,7 @@ func runner(runtime phoenix.Runtime) error {
// Load extra templates folder
extraFolder, err := runtime.GetString("app", "extra")
- if err == nil {
+ if err == nil {
if !httputils.HasDirPath(extraFolder) {
return fmt.Errorf("Configured extra '%s' is not a directory.", extraFolder)
}
@@ -229,7 +234,7 @@ func runner(runtime phoenix.Runtime) error {
if err != nil {
return fmt.Errorf("Failed to load extra templates: %s", err)
} else {
- log.Printf("Loaded extra templates from: %s", extraFolder);
+ log.Printf("Loaded extra templates from: %s", extraFolder)
}
}