diff --git a/.gitignore b/.gitignore index 095b6dbf..c4a0697c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ resources/development/nginx app/.env app/.status_hash casdoor.pub +.idea/deployment.xml +.idea/webServers.xml diff --git a/install.sh b/install.sh index 7a9e72a3..20976d0f 100644 --- a/install.sh +++ b/install.sh @@ -289,6 +289,9 @@ install_config() { mkdir -p "$DataPath" if [[ ! -f "$DataPath/app.ini" ]]; then cat > "$DataPath/app.ini" << EOF +[app] +PageSize = 10 + [server] HOST = 0.0.0.0 PORT = 9000 diff --git a/resources/demo/app.ini b/resources/demo/app.ini index 78d30fef..097ac0a0 100644 --- a/resources/demo/app.ini +++ b/resources/demo/app.ini @@ -1,19 +1,77 @@ -[server] -HttpPort = 9000 -RunMode = release +[app] +PageSize = 10 JwtSecret = 6EEB622E-5C73-4082-AF76-7BAC337772F2 -Email = test@jackyu.cn -HTTPChallengePort = 9180 -StartCmd = bash -NodeSecret = 57D079F2-CA8B-412A-B5C0-FDA291C13391 -Demo = true + +[server] +Host = +Port = 9000 +RunMode = release + +[database] +Name = database + +[auth] +IPWhiteList = +BanThresholdMinutes = 10 +MaxAttempts = 10 + +[casdoor] +Endpoint = +ClientId = +ClientSecret = +CertificatePath = +Organization = +Application = +RedirectUri = + +[cert] +Email = test@jackyu.cn +CADir = https://acme-staging-v02.api.letsencrypt.org/directory +RenewalInterval = 0 +RecursiveNameservers = +HTTPChallengePort = 9180 + +[cluster] +Node = + +[crypto] +Secret = 4a82fe17c5aab629007462b303c367d2863b7db28b95c8f869f2f815672d41d8 + +[http] +GithubProxy = +InsecureSkipVerify = false + +[logrotate] +Enabled = false +CMD = logrotate /etc/logrotate.d/nginx +Interval = 0 [nginx] -AccessLogPath = -ErrorLogPath = +AccessLogPath = +ErrorLogPath = +LogDirWhiteList = /var/log/nginx +ConfigDir = +PIDPath = +TestConfigCmd = +ReloadCmd = +RestartCmd = + +[node] +Name = +Secret = 57D079F2-CA8B-412A-B5C0-FDA291C13391 +SkipInstallation = false +Demo = true [openai] -Model = gpt-3.5-turbo BaseUrl = -Proxy = Token = +Proxy = +Model = gpt-3.5-turbo + +[terminal] +StartCmd = bash + +[webauthn] +RPDisplayName = +RPID = +RPOrigins = diff --git a/resources/demo/demo.db b/resources/demo/demo.db index 2f78552f..2ae6cf1c 100644 Binary files a/resources/demo/demo.db and b/resources/demo/demo.db differ diff --git a/settings/database.go b/settings/database.go index 7e35f1c8..5524b46e 100644 --- a/settings/database.go +++ b/settings/database.go @@ -4,7 +4,9 @@ type Database struct { Name string } -var DatabaseSettings = &Database{} +var DatabaseSettings = &Database{ + Name: "database", +} func (d *Database) GetName() string { return d.Name diff --git a/settings/server_v1.go b/settings/server_v1.go index 7f54d066..27e78d50 100644 --- a/settings/server_v1.go +++ b/settings/server_v1.go @@ -74,6 +74,10 @@ func (v1 *serverV1) migrateToV2() (v2 *settingsV2) { v2.Http.InsecureSkipVerify = v1.InsecureSkipVerify v2.Node.Name = v1.Name + if v1.Database == "" { + v2.DataBase.Name = "database" + } + return } diff --git a/settings/server_v1_test.go b/settings/server_v1_test.go index ce29093e..addf173f 100644 --- a/settings/server_v1_test.go +++ b/settings/server_v1_test.go @@ -61,7 +61,7 @@ StartCmd = bash Database = database CADir = /test GithubProxy = https://mirror.ghproxy.com/ -Secret = newSecret +Secret = newSecret Demo = false PageSize = 20 HttpHost = 0.0.0.0 diff --git a/settings/settings.go b/settings/settings.go index e763ecdc..4b90f728 100644 --- a/settings/settings.go +++ b/settings/settings.go @@ -43,6 +43,7 @@ func init() { t := time.Unix(cast.ToInt64(buildTime), 0) LastModified = strings.ReplaceAll(t.Format(time.RFC1123), "UTC", "GMT") + sections.Set("database", DatabaseSettings) sections.Set("auth", AuthSettings) sections.Set("casdoor", CasdoorSettings) sections.Set("cert", CertSettings) @@ -86,7 +87,7 @@ func Init() { func Save() (err error) { // fix unable to save empty slice if len(CertSettings.RecursiveNameservers) == 0 { - settings.Conf.Section("server").Key("RecursiveNameservers").SetValue("") + settings.Conf.Section("cert").Key("RecursiveNameservers").SetValue("") } err = settings.Save()