PapaTutuWawa/rio
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Wildcards #2

Merged
PapaTutuWawa merged 17 commits from feat/wildcards into master 2024-01-11 20:04:50 +00:00
Conversation 0 Commits 17 Files Changed 13 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 996aa10866 - Show all commits

2
cmd/rio/main.go
View File

@ -68,7 +68,7 @@ func Handler(pagesDomain, giteaUrl, defaultCsp string, giteaClient *repo.GiteaCl
if strings.HasSuffix(cname, pagesDomain) { if strings.HasSuffix(cname, pagesDomain) {
log.Debugf("%s is alias of %s and can be handled after a CNAME query", req.Host, cname) log.Debugf("%s is alias of %s and can be handled after a CNAME query", req.Host, cname)
handleSubdomain(cname, cname, req.URL.Path, giteaUrl, defaultCsp, giteaClient, w) handleSubdomain(req.Host, cname, req.URL.Path, giteaUrl, defaultCsp, giteaClient, w)
return return
} }

2
internal/repo/repo.go
View File

@ -86,7 +86,7 @@ func lookupRepositoryAndCache(username, reponame, branchName, host, domain, path
log.Debugf("CNAME Content: %s", cnameContent) log.Debugf("CNAME Content: %s", cnameContent)
if cnameContent != cname { if cnameContent != cname {
log.Warnf("CNAME mismatch: Got '%s', expected '%s'", cname, cnameContent) log.Warnf("CNAME mismatch: Repo '%s', CNAME '%s'", cnameContent, cname)
return nil, errors.New("CNAME mismatch") return nil, errors.New("CNAME mismatch")
} }
} }