medlogic
/
olivetin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature: webui directory is now configurable

This commit is contained in:
jamesread 2023-03-21 10:20:17 +00:00
parent 8ed3db0170
commit 63fe78b4fe
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/config/config.go
View File

@ -80,6 +80,7 @@ type Config struct {
AuthHttpHeaderUserGroup string AuthHttpHeaderUserGroup string
DefaultPermissions PermissionsList DefaultPermissions PermissionsList
AccessControlLists []AccessControlList AccessControlLists []AccessControlList
WebUIDir string
} }
// DefaultConfig gets a new Config structure with sensible default values. // DefaultConfig gets a new Config structure with sensible default values.
@ -101,6 +102,7 @@ func DefaultConfig() *Config {
config.DefaultPermissions.View = true config.DefaultPermissions.View = true
config.AuthJwtClaimUsername = "name" config.AuthJwtClaimUsername = "name"
config.AuthJwtClaimUserGroup = "group" config.AuthJwtClaimUserGroup = "group"
config.WebUIDir = "./webui"
return &config return &config
} }

2
internal/httpservers/webuiServer.go
View File

@ -24,7 +24,7 @@ type webUISettings struct {
func findWebuiDir() string { func findWebuiDir() string {
directoriesToSearch := []string{ directoriesToSearch := []string{
"./webui", cfg.WebUIDir,
"/usr/share/OliveTin/webui/", "/usr/share/OliveTin/webui/",
"/var/www/OliveTin/", "/var/www/OliveTin/",
"/var/www/olivetin/", "/var/www/olivetin/",