consume variables to set username and password otherwise use defaults (#90)

This commit is contained in:
Robin Horton 2021-08-24 12:41:52 -07:00 committed by GitHub
parent 1711530dda
commit acbe5b48e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 3 deletions

View file

@ -1,4 +1,4 @@
version: '3' version: "3"
services: services:
wg: wg:
@ -10,6 +10,9 @@ services:
- EMAIL_FROM - EMAIL_FROM
- EMAIL_FROM_NAME - EMAIL_FROM_NAME
- SESSION_SECRET - SESSION_SECRET
- WGUI_USERNAME=alpha
- WGUI_PASSWORD=this-unusual-password
ports: ports:
- 5000:5000 - 5000:5000
logging: logging:

View file

@ -15,6 +15,8 @@ import (
) )
const dbPath = "./db" const dbPath = "./db"
const username_env_var = "WGUI_USERNAME"
const password_env_var = "WGUI_PASSWORD"
const defaultUsername = "admin" const defaultUsername = "admin"
const defaultPassword = "admin" const defaultPassword = "admin"
const defaultServerAddress = "10.252.1.0/24" const defaultServerAddress = "10.252.1.0/24"
@ -33,6 +35,13 @@ func DBConn() (*scribble.Driver, error) {
return db, nil return db, nil
} }
func getCredVar(key, fallback string) string {
if value, ok := os.LookupEnv(key); ok {
return value
}
return fallback
}
// InitDB to create the default database // InitDB to create the default database
func InitDB() error { func InitDB() error {
var clientPath string = path.Join(dbPath, "clients") var clientPath string = path.Join(dbPath, "clients")
@ -112,8 +121,8 @@ func InitDB() error {
} }
user := new(model.User) user := new(model.User)
user.Username = defaultUsername user.Username = getCredVar(username_env_var, defaultUsername)
user.Password = defaultPassword user.Password = getCredVar(password_env_var, defaultPassword)
db.Write("server", "users", user) db.Write("server", "users", user)
} }