From 51954417cda24a1aca244e19d9166cafa34f07f7 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Mon, 14 Nov 2022 15:46:48 +0100 Subject: [PATCH] defined branches are requested before the default branch on the default repo --- server/handler/handler_sub_domain.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/server/handler/handler_sub_domain.go b/server/handler/handler_sub_domain.go index 854e778..3e4866b 100644 --- a/server/handler/handler_sub_domain.go +++ b/server/handler/handler_sub_domain.go @@ -103,7 +103,7 @@ func handleSubDomain(log zerolog.Logger, ctx *context.Context, giteaClient *gite // Try to use the defaultPagesRepo on its default branch // example.codeberg.page/index.html - log.Debug().Msg("main domain preparations, now trying with default repo/branch") + log.Debug().Msg("main domain preparations, now trying with default repo") if targetOpt, works := tryBranch(log, ctx, giteaClient, &upstream.Options{ TryIndexPages: true, TargetOwner: targetOwner, @@ -117,6 +117,18 @@ func handleSubDomain(log zerolog.Logger, ctx *context.Context, giteaClient *gite } } + log.Debug().Msg("main domain preparations, now trying with default repo/branch") + if targetOpt, works := tryBranch(log, ctx, giteaClient, &upstream.Options{ + TryIndexPages: true, + TargetOwner: targetOwner, + TargetRepo: defaultPagesRepo, + TargetPath: path.Join(pathElements...), + }, false); works { + log.Debug().Msg("tryBranch, now trying upstream 6") + tryUpstream(ctx, giteaClient, mainDomainSuffix, trimmedHost, targetOpt, canonicalDomainCache) + return + } + // Couldn't find a valid repo/branch html.ReturnErrorPage(ctx, fmt.Sprintf("couldn't find a valid repo[%s]", targetRepo),