Worked on ease of use for non multi tenant scenarios, Closes #20

This commit is contained in:
Torkel Ödegaard
2015-01-27 15:14:53 +01:00
parent 257519490a
commit 757b185398
8 changed files with 105 additions and 33 deletions
+1 -4
View File
@@ -11,7 +11,6 @@ import (
m "github.com/torkelo/grafana-pro/pkg/models"
"github.com/torkelo/grafana-pro/pkg/services/sqlstore/migrator"
"github.com/torkelo/grafana-pro/pkg/setting"
"github.com/torkelo/grafana-pro/pkg/util"
_ "github.com/go-sql-driver/mysql"
"github.com/go-xorm/xorm"
@@ -40,9 +39,7 @@ func EnsureAdminUser() {
cmd := m.CreateUserCommand{}
cmd.Login = setting.AdminUser
cmd.Email = setting.AdminUser + "@localhost"
cmd.Salt = util.GetRandomString(10)
cmd.Rands = util.GetRandomString(10)
cmd.Password = util.EncodePassword(setting.AdminPassword, cmd.Salt)
cmd.Password = setting.AdminPassword
cmd.IsAdmin = true
if err = bus.Dispatch(&cmd); err != nil {