diff --git a/pkg/config/config.go b/pkg/config/config.go index c49a8db..32e7a7e 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -16,8 +16,8 @@ type Config struct { Email *EmailConfig Twitter *TwitterConfig SlackHook string `envconfig:"SLACK_HOOK"` - AdminUser string `envconfig:"ADMIN_USER"` - AdminPassword string `envconfig:"ADMIN_PASSWORD"` + AdminUser string `envconfig:"ADMIN_USER" required:"true" default:"admin"` + AdminPassword string `envconfig:"ADMIN_PASSWORD" require:"true" default:"password"` } type EmailConfig struct { diff --git a/pkg/server/server.go b/pkg/server/server.go index 3ed0d81..18e8dcf 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -82,13 +82,9 @@ func NewServer(c *ServerConfig) (http.Server, error) { // Admin routes admin := router.Group("/admin") - - accounts := gin.Accounts{} - if c.Config.AdminUser != "" { - accounts[c.Config.AdminUser] = c.Config.AdminPassword - } - - admin.Use(gin.BasicAuth(accounts)) + admin.Use(gin.BasicAuth(gin.Accounts{ + c.Config.AdminUser: c.Config.AdminPassword, + })) { admin.GET("", ctrl.AdminIndex) admin.GET("/jobs/:id/edit", ctrl.EditJob)