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

Fix redirects for pages repo

Browse Source
This commit is contained in:
Moritz Marquardt 2021-03-19 21:33:57 +01:00
parent 203e230905
commit 2e0608c270
No known key found for this signature in database
GPG Key ID: D5788327BEE388B6
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
handler.go
View File

@ -148,6 +148,12 @@ func handler(ctx *fasthttp.RequestCtx) {
// Check if the first directory is a repo with the second directory as a branch // Check if the first directory is a repo with the second directory as a branch
// example.codeberg.page/myrepo/@main/index.html // example.codeberg.page/myrepo/@main/index.html
if len(pathElements) > 1 && strings.HasPrefix(pathElements[1], "@") { if len(pathElements) > 1 && strings.HasPrefix(pathElements[1], "@") {
if targetRepo == "pages" {
// example.codeberg.org/pages/@... redirects to example.codeberg.org/@...
ctx.Redirect("/" + strings.Join(pathElements[1:], "/"), fasthttp.StatusMovedPermanently)
return
}
if tryBranch(pathElements[0], pathElements[1][1:], pathElements[2:], if tryBranch(pathElements[0], pathElements[1][1:], pathElements[2:],
"/"+pathElements[0]+"/%p", "/"+pathElements[0]+"/%p",
) { ) {
@ -171,7 +177,8 @@ func handler(ctx *fasthttp.RequestCtx) {
// Check if the first directory is a repo with a "pages" branch // Check if the first directory is a repo with a "pages" branch
// example.codeberg.page/myrepo/index.html // example.codeberg.page/myrepo/index.html
if tryBranch(pathElements[0], "pages", pathElements[1:], "") { // example.codeberg.page/pages/... is not allowed here.
if pathElements[0] != "pages" && tryBranch(pathElements[0], "pages", pathElements[1:], "") {
tryUpstream() tryUpstream()
return return
} }

4
main.go
View File

@ -2,11 +2,13 @@
// //
// Mapping custom domains is not static anymore, but can be done with DNS: // Mapping custom domains is not static anymore, but can be done with DNS:
// //
// 1) add a "domains.txt" text file to your repository, containing the allowed domains, separated by new lines. // 1) add a "domains.txt" text file to your repository, containing the allowed domains, separated by new lines. The
// first line will be the canonical domain/URL; all other occurrences will be redirected to it.
// //
// 2) add a CNAME entry to your domain, pointing to "[[{branch}.]{repo}.]{owner}.codeberg.page" (repo defaults to // 2) add a CNAME entry to your domain, pointing to "[[{branch}.]{repo}.]{owner}.codeberg.page" (repo defaults to
// "pages", "branch" defaults to the default branch if "repo" is "pages", or to "pages" if "repo" is something else): // "pages", "branch" defaults to the default branch if "repo" is "pages", or to "pages" if "repo" is something else):
// www.example.org. IN CNAME main.pages.example.codeberg.page. // www.example.org. IN CNAME main.pages.example.codeberg.page.
//
// 3) if a CNAME is set for "www.example.org", you can redirect there from the naked domain by adding an ALIAS record // 3) if a CNAME is set for "www.example.org", you can redirect there from the naked domain by adding an ALIAS record
// for "example.org" (if your provider allows ALIAS or similar records): // for "example.org" (if your provider allows ALIAS or similar records):
// example.org IN ALIAS codeberg.page. // example.org IN ALIAS codeberg.page.