From 2bcd9e985bcc4b229490b7acdb2eb975e7ce8be8 Mon Sep 17 00:00:00 2001 From: Craig Date: Sun, 5 Apr 2020 01:24:54 +0000 Subject: [PATCH] rename admin flag to password_admin --- server/.vscode/launch.json | 2 +- server/internal/types/config/websocket.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/.vscode/launch.json b/server/.vscode/launch.json index 9c3cb0a2..02c7b7db 100644 --- a/server/.vscode/launch.json +++ b/server/.vscode/launch.json @@ -10,7 +10,7 @@ "envFile": "${workspaceFolder}/.env.development", "output": "${workspaceFolder}/bin/debug/neko", "cwd": "${workspaceFolder}/", - "args": ["serve", "-d", "--bind", ":3000", "--static", "../client/dist", "--password", "neko", "--admin", "admin"] + "args": ["serve", "-d", "--bind", ":3000", "--static", "../client/dist", "--password", "neko", "--password_admin", "admin"] } ] } diff --git a/server/internal/types/config/websocket.go b/server/internal/types/config/websocket.go index 11c94cbb..b93dc594 100644 --- a/server/internal/types/config/websocket.go +++ b/server/internal/types/config/websocket.go @@ -16,8 +16,8 @@ func (WebSocket) Init(cmd *cobra.Command) error { return err } - cmd.PersistentFlags().String("admin", "admin", "admin password for connecting to stream") - if err := viper.BindPFlag("admin", cmd.PersistentFlags().Lookup("admin")); err != nil { + cmd.PersistentFlags().String("password_admin", "admin", "admin password for connecting to stream") + if err := viper.BindPFlag("password_admin", cmd.PersistentFlags().Lookup("password_admin")); err != nil { return err } @@ -26,5 +26,5 @@ func (WebSocket) Init(cmd *cobra.Command) error { func (s *WebSocket) Set() { s.Password = viper.GetString("password") - s.AdminPassword = viper.GetString("admin") + s.AdminPassword = viper.GetString("password_admin") }