mirrors/frp
1
0
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2025-07-15 10:19:26 +07:00
Code Issues Packages Projects Releases Wiki Activity

Add an "assets_dir" option for frpc

Browse Source 
This option allows users to specify where they want assets to be loaded
from, like the "assets_dir" option that already exists for frps. This
allows library users to use the admin panel without having to bundle
assets with statik.
This commit is contained in:
Tyler Compton
2019-08-19 16:51:03 -07:00
parent 00bd0a8af4
commit bc46e3330a
4 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
models/config/client_common.go
View File

@ -38,6 +38,7 @@ type ClientCommonConf struct {
AdminPort int `json:"admin_port"`
AdminUser string `json:"admin_user"`
AdminPwd string `json:"admin_pwd"`
AssetsDir string `json:"assets_dir"`
PoolCount int `json:"pool_count"`
TcpMux bool `json:"tcp_mux"`
User string `json:"user"`
@ -65,6 +66,7 @@ func GetDefaultClientConf() *ClientCommonConf {
AdminPort: 0,
AdminUser: "",
AdminPwd: "",
AssetsDir: "",
PoolCount: 1,
TcpMux: true,
User: "",
@ -160,6 +162,10 @@ func UnmarshalClientConfFromIni(defaultCfg *ClientCommonConf, content string) (c
cfg.AdminPwd = tmpStr
}
if tmpStr, ok = conf.Get("common", "assets_dir"); ok {
cfg.AssetsDir = tmpStr
}
if tmpStr, ok = conf.Get("common", "pool_count"); ok {
if v, err = strconv.ParseInt(tmpStr, 10, 64); err == nil {
cfg.PoolCount = int(v)