s83/pages-server
1
0
Fork 0
mirror of https://codeberg.org/Codeberg/pages-server.git synced 2024-12-02 18:45:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: finish use default const for defaultPagesBranch and defaultPagesRepo

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/handler/handler.go
View File

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

3
server/handler/handler_sub_domain.go
View File

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

2
server/handler/try.go
View File

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