Can now change all configuration options per instance

This commit is contained in:
2026-06-06 18:09:07 -05:00
parent 336973443d
commit c3e17f9a80
6 changed files with 24 additions and 32 deletions

View File

@@ -10,23 +10,18 @@ import (
"strings"
)
type VsServerConfigOptions struct {
Version string `json:"Version"`
ServerName string `json:"ServerName"`
Port int `json:"Port"`
IpAddress string `json:"IpAddress"`
MaxClients int `json:"MaxClients"`
Password string `json:"Password"`
DefaultRole string `json:"DefaultRole"`
GuestRole string `json:"GuestRole"`
PreApprovedRole string `json:"PreApprovedRole"`
type InstanceMetadata struct {
Version string `json:"Version"`
ServerName string `json:"ServerName"`
Port int `json:"Port"`
Config map[string]interface{} `json:"config"`
}
func PrepareInstanceConfig(templateVersion string, instanceConfigPath string, options VsServerConfigOptions, cfg *AppConfig) error {
return SyncInstanceConfig(templateVersion, instanceConfigPath, options, cfg)
func PrepareInstanceConfig(templateVersion string, instanceConfigPath string, meta InstanceMetadata, cfg *AppConfig) error {
return SyncInstanceConfig(templateVersion, instanceConfigPath, meta, cfg)
}
func SyncInstanceConfig(templateVersion string, instanceConfigPath string, options VsServerConfigOptions, cfg *AppConfig) error {
func SyncInstanceConfig(templateVersion string, instanceConfigPath string, meta InstanceMetadata, cfg *AppConfig) error {
templatePath := filepath.Join(cfg.Storage.ConfigTemplatesDir, templateVersion, "serverconfig.json")
if err := ensureTemplateExists(templateVersion, templatePath, cfg); err != nil {
@@ -66,16 +61,13 @@ func SyncInstanceConfig(templateVersion string, instanceConfigPath string, optio
return fmt.Errorf("failed parsing configuration JSON payload: %w", err)
}
rawConfig["ServerName"] = options.ServerName
rawConfig["Port"] = options.Port
rawConfig["MaxClients"] = options.MaxClients
if options.Password != "" {
rawConfig["Password"] = options.Password
} else {
rawConfig["Password"] = nil
for key, value := range meta.Config {
rawConfig[key] = value
}
rawConfig["ServerName"] = meta.ServerName
rawConfig["Port"] = meta.Port
instanceDir := filepath.Dir(instanceConfigPath)
if worldConfig, ok := rawConfig["WorldConfig"].(map[string]interface{}); ok {
worldConfig["SaveFileLocation"] = filepath.Join(instanceDir, "Saves", "default.vcdbs")