|
|
@@ -2,39 +2,38 @@ package config
|
|
|
|
|
|
import (
|
|
|
"encoding/json"
|
|
|
+ "fmt"
|
|
|
"goseg/structs"
|
|
|
+ "io/ioutil"
|
|
|
"log/slog"
|
|
|
+ "net"
|
|
|
+ "net/http"
|
|
|
"os"
|
|
|
"path/filepath"
|
|
|
"sync"
|
|
|
- "net/http"
|
|
|
- "io/ioutil"
|
|
|
- "net"
|
|
|
"time"
|
|
|
- "fmt"
|
|
|
)
|
|
|
|
|
|
var (
|
|
|
- globalConfig structs.SysConfig
|
|
|
- logger = slog.New(slog.NewJSONHandler(os.Stdout, nil))
|
|
|
- basePath = "/home/nativeplanet/gits"
|
|
|
- Version = "v2.0.0"
|
|
|
- Ready = false
|
|
|
+ globalConfig structs.SysConfig
|
|
|
+ logger = slog.New(slog.NewJSONHandler(os.Stdout, nil))
|
|
|
+ basePath = "/home/nativeplanet/gits"
|
|
|
+ Version = "v2.0.0"
|
|
|
+ Ready = false
|
|
|
VersionServerReady = false
|
|
|
- VersionInfo structs.Version
|
|
|
- Ram int
|
|
|
- Cpu int
|
|
|
- CoreTemp int
|
|
|
- Disk int
|
|
|
- WifiEnabled = false
|
|
|
- ActiveNetwork string
|
|
|
- WifiNetworks []string
|
|
|
- HttpOpen = false
|
|
|
- UploadSecret string
|
|
|
- confMutex sync.Mutex
|
|
|
+ VersionInfo structs.Version
|
|
|
+ Ram int
|
|
|
+ Cpu int
|
|
|
+ CoreTemp int
|
|
|
+ Disk int
|
|
|
+ WifiEnabled = false
|
|
|
+ ActiveNetwork string
|
|
|
+ WifiNetworks []string
|
|
|
+ HttpOpen = false
|
|
|
+ UploadSecret string
|
|
|
+ confMutex sync.Mutex
|
|
|
)
|
|
|
|
|
|
-
|
|
|
func init() {
|
|
|
confPath := filepath.Join(basePath, "settings", "system2.json")
|
|
|
file, err := os.Open(confPath)
|
|
|
@@ -118,20 +117,20 @@ func createDefaultConf() error {
|
|
|
Interval: "week",
|
|
|
Previous: false,
|
|
|
},
|
|
|
- DockerData: "/var/lib/docker",
|
|
|
- WgOn: false,
|
|
|
- WgRegistered: false,
|
|
|
- PwHash: "",
|
|
|
- C2cInterval: 0,
|
|
|
- FirstBoot: false,
|
|
|
- WgRegisterd: false,
|
|
|
- GsVersion: Version,
|
|
|
- CfgDir: "",
|
|
|
+ DockerData: "/var/lib/docker",
|
|
|
+ WgOn: false,
|
|
|
+ WgRegistered: false,
|
|
|
+ PwHash: "",
|
|
|
+ C2cInterval: 0,
|
|
|
+ FirstBoot: false,
|
|
|
+ WgRegisterd: false,
|
|
|
+ GsVersion: Version,
|
|
|
+ CfgDir: "",
|
|
|
UpdateInterval: 0,
|
|
|
- BinHash: "",
|
|
|
- Pubkey: "",
|
|
|
- Privkey: "",
|
|
|
- Salt: "",
|
|
|
+ BinHash: "",
|
|
|
+ Pubkey: "",
|
|
|
+ Privkey: "",
|
|
|
+ Salt: "",
|
|
|
}
|
|
|
path := filepath.Join(basePath, "settings", "system2.json")
|
|
|
if err := os.MkdirAll(filepath.Dir(path), os.ModePerm); err != nil {
|
|
|
@@ -221,4 +220,4 @@ func CheckVersion() bool {
|
|
|
return true
|
|
|
}
|
|
|
return false
|
|
|
-}
|
|
|
+}
|