refactor: finish use default const for defaultPagesBranch and defaultPagesRepo

This commit is contained in:
6543 2022-11-12 21:16:11 +01:00
parent c827a28dd8
commit 4565481643
No known key found for this signature in database
GPG Key ID: C99B82E40B027BAE
3 changed files with 3 additions and 4 deletions

View File

@ -16,6 +16,8 @@ import (
const (
headerAccessControlAllowOrigin = "Access-Control-Allow-Origin"
headerAccessControlAllowMethods = "Access-Control-Allow-Methods"
defaultPagesRepo = "pages"
defaultPagesBranch = "pages"
)
// Handler handles a single HTTP request to the web server.

View File

@ -15,9 +15,6 @@ import (
"codeberg.org/codeberg/pages/server/upstream"
)
const defaultPagesRepo = "pages"
const defaultPagesBranch = "pages"
func handleSubDomain(log zerolog.Logger, ctx *context.Context, giteaClient *gitea.Client,
mainDomainSuffix string,
trimmedHost string,

View File

@ -24,7 +24,7 @@ func tryUpstream(ctx *context.Context, giteaClient *gitea.Client,
canonicalDomain, _ := options.CheckCanonicalDomain(giteaClient, "", string(mainDomainSuffix), canonicalDomainCache)
if !strings.HasSuffix(strings.SplitN(canonicalDomain, "/", 2)[0], string(mainDomainSuffix)) {
canonicalPath := ctx.Req.RequestURI
if options.TargetRepo != "pages" {
if options.TargetRepo != defaultPagesRepo {
path := strings.SplitN(canonicalPath, "/", 3)
if len(path) >= 3 {
canonicalPath = "/" + path[2]