Merge pull request #83 from centrifugal/admin_websocket

Admin websocket refactoring
centrifugal · Mar 24, 2016 · 633967d · 633967d
2 parents cf5a53e + 21e869a
commit 633967d
Show file tree

Hide file tree

Showing 16 changed files with 52,982 additions and 485 deletions.
diff --git a/bindata.go b/bindata.go
diff --git a/config.go b/config.go
@@ -22,9 +22,10 @@ func newConfig() *libcentrifugo.Config {
 	cfg.Version = VERSION
 	cfg.Name = getApplicationName()
 	cfg.Debug = viper.GetBool("debug")
+	cfg.Admin = viper.GetBool("admin") || viper.GetBool("web")
 	cfg.Web = viper.GetBool("web")
-	cfg.WebPassword = viper.GetString("web_password")
-	cfg.WebSecret = viper.GetString("web_secret")
+	cfg.AdminPassword = viper.GetString("admin_password")
+	cfg.AdminSecret = viper.GetString("admin_secret")
 	cfg.ChannelPrefix = viper.GetString("channel_prefix")
 	cfg.AdminChannel = libcentrifugo.ChannelID(cfg.ChannelPrefix + "." + "admin")
 	cfg.ControlChannel = libcentrifugo.ChannelID(cfg.ChannelPrefix + "." + "control")
@@ -50,7 +51,7 @@ func newConfig() *libcentrifugo.Config {
 	cfg.ClientChannelLimit = viper.GetInt("client_channel_limit")
 	cfg.Insecure = viper.GetBool("insecure")
 	cfg.InsecureAPI = viper.GetBool("insecure_api")
-	cfg.InsecureWeb = viper.GetBool("insecure_web")
+	cfg.InsecureAdmin = viper.GetBool("insecure_admin") || viper.GetBool("insecure_web")
 
 	cfg.Secret = viper.GetString("secret")
 	cfg.ConnLifetime = int64(viper.GetInt("connection_lifetime"))

diff --git a/extras/web/index.html b/extras/web/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>Centrifugal web</title>
+    <title>Centrifugo</title>
     <meta charset=utf-8>
     <meta name=description content="Web interface for Centrifugal server">
     <link rel="shortcut icon" href="public/images/favicon.ico" type="image/x-icon">