From 648d9e253c1924b832248f26fee42b2fb64dc3bc Mon Sep 17 00:00:00 2001 From: ᴜɴᴋɴᴡᴏɴ Date: Sat, 22 Feb 2020 09:05:26 +0800 Subject: conf: overhaul server settings (#5928) * conf: rename package * Requires Go 1.12 * Fix lint * Fix lint * Overhaul * db: fix tests * Save my work * Fix tests * Server.UnixSocketPermission * Server.LocalRootURL * SSH settings * Server.OfflineMode * Save my work * App.Version * Remove [server] STATIC_ROOT_PATH * Server.LandingURL --- internal/route/dev/template.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'internal/route/dev/template.go') diff --git a/internal/route/dev/template.go b/internal/route/dev/template.go index be1fe360..daa8e8f4 100644 --- a/internal/route/dev/template.go +++ b/internal/route/dev/template.go @@ -5,19 +5,19 @@ package dev import ( + "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" "gogs.io/gogs/internal/db" - "gogs.io/gogs/internal/setting" ) func TemplatePreview(c *context.Context) { c.Data["User"] = db.User{Name: "Unknown"} - c.Data["AppName"] = setting.AppName - c.Data["AppVersion"] = setting.AppVersion - c.Data["AppURL"] = setting.AppURL + c.Data["AppName"] = conf.App.BrandName + c.Data["AppVersion"] = conf.App.Version + c.Data["AppURL"] = conf.Server.ExternalURL c.Data["Code"] = "2014031910370000009fff6782aadb2162b4a997acb69d4400888e0b9274657374" - c.Data["ActiveCodeLives"] = setting.Service.ActiveCodeLives / 60 - c.Data["ResetPwdCodeLives"] = setting.Service.ResetPwdCodeLives / 60 + c.Data["ActiveCodeLives"] = conf.Service.ActiveCodeLives / 60 + c.Data["ResetPwdCodeLives"] = conf.Service.ResetPwdCodeLives / 60 c.Data["CurDbValue"] = "" c.HTML(200, (c.Params("*"))) -- cgit v1.2.3