.gitignore

@@ -1,3 +1,2 @@
 caddy
-Caddyfile
+Caddyfile
-Caddyfile_gitea-test.psi.ch

Dockerfile

@@ -1,6 +1,6 @@
 FROM caddy:builder-alpine AS builder
 
-RUN xcaddy build --with github.com/simongregorebner/gitea-pages@v0.0.8
+RUN xcaddy build --with github.com/simongregorebner/gitea-pages@v0.0.4
 
 
 FROM alpine

Readme.md

@@ -17,12 +17,6 @@ In __simple__ mode no special DNS setup is required and the access to the hosted
 
 __http(s)://<your-server-hostname>/<organization>/<repository>__ 
 
-To create a pages site, just 
-1. Create a `gitea-pages` branch in any repository of an organization
-2. Put your content in this branch. (eg index.html) and push the branch
-
-After the push the content will be available at: http(s)://<your-server-hostname>/<organization>/<repository>
-
 ## Classic Mode
 
 In __classic__ mode the access to the pages goes according to these two patterns: 
@@ -33,26 +27,10 @@ or
 
 __http(s)://<organization>.<your-server-hostname>__ 
 
-The latter url scheme with serves the content of the repo named __gitea-pages__ of the organization (with default settings, however you can also set it to github like convention or  __<organization>.<repository_suffix>__ ).
+The latter url scheme with serves the content of the repo named __<organization>.gitea-pages__ of the organization (with default settings).
-
-
-In this mode you can create pages content like this:
-
-1. Create a `gitea-pages` repo in any organization
-2. Create a `gitea-pages` branch in this `gitea-pages` repository
-3. Put your content in this branch. (eg index.html)
-
-Your content will now be available on https://<organization>.<your-server-domain>/index.html
-
-
-Beside this you can simply create a `gitea-pages` branch in any repository of the organization and push it to the gitea server. 
-These pages are then available at: https://<organization>.<your-server-domain>/
-
-
 
 Classic mode requires that you setup a _wildcard CNAME_ in DNS for your gitea pages host (see below for more details). You also need a _wildcard HTTPS_ certificate if you want to run with HTTPS.
 
-
 # Usage
 
 To run the server in __simple__ mode you need a minimal configuration (filename _Caddyfile_) like this (replace _your-gitea-server_ and _gitea_access_token_):
@@ -111,8 +89,7 @@ log {
 | server | The URL of your Gitea server.  |
 | token | Your access token for the Gitea API. This token is used to authenticate requests made to the Gitea server.|
 | pages_branch | The branch in your repository that contains the static files for your website or documentation. By default, this would be the branch "gitea-pages" |
-| pages_repository | The default repository of an organization |
+| postfix_pages_repository | The (domain) postfix used for the pages repository. (This could be the domain where your site will be accessible, such as "gitea.io".) |
-| postfix_pages_repository | The (domain) postfix used for the pages repository. __This setting is only used if pages_repository is not set!__ (This could be the domain where your site will be accessible, such as "gitea.io".) |
 | url_scheme | The URL scheme to use for the pages. "simple" or "classic |
 
 
@@ -162,7 +139,6 @@ docker build --platform=linux/amd64 -t gitea-pages .
 
 # example build image for this github user
 docker build --platform=linux/amd64 -t ghcr.io/simongregorebner/gitea-pages:0.0.1 .
-docker push ghcr.io/simongregorebner/gitea-pages:0.0.1
 ```
 
 ## Testing

docker-compose.yml

@@ -1,12 +0,0 @@
-services:
-  server:
-    image: ghcr.io/simongregorebner/gitea-pages:0.0.8
-    container_name: gitea-pages
-    restart: always
-    volumes:
-      - ./Caddyfile:/etc/caddy/Caddyfile:ro
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
-
-    ports:
-      - "8080:8080/tcp"

giteapages.go

@@ -6,7 +6,6 @@ import (
 	"io/fs"
 	"mime"
 	"net/http"
-	"net/url"
 	"strings"
 
 	"code.gitea.io/sdk/gitea"
@@ -35,7 +34,6 @@ type GiteaPagesModule struct {
 	Server                 string        `json:"server,omitempty"`
 	Token                  string        `json:"token,omitempty"`
 	PagesBranch            string        `json:"pages_branch,omitempty"`
-	PagesRepository        string        `json:"pages_repository,omitempty"`
 	PostfixPagesRepository string        `json:"postfix_pages_repository,omitempty"`
 	URLScheme              string        `json:"url_scheme,omitempty"`
 }
@@ -67,8 +65,6 @@ func (module *GiteaPagesModule) UnmarshalCaddyfile(d *caddyfile.Dispenser) error
 				d.Args(&module.Token)
 			case "pages_branch":
 				d.Args(&module.PagesBranch)
-			case "pages_repository":
-				d.Args(&module.PagesRepository)
 			case "postfix_pages_repository":
 				d.Args(&module.PostfixPagesRepository)
 			case "url_scheme":
@@ -80,10 +76,8 @@ func (module *GiteaPagesModule) UnmarshalCaddyfile(d *caddyfile.Dispenser) error
 		if module.PagesBranch == "" {
 			module.PagesBranch = "gitea-pages"
 		}
-		if module.PagesRepository == "" {
+		if module.PostfixPagesRepository == "" {
-			if module.PostfixPagesRepository == "" {
+			module.PostfixPagesRepository = "gitea-pages"
-				module.PostfixPagesRepository = "gitea-pages"
-			}
 		}
 
 		if module.URLScheme == "" {
@@ -104,18 +98,12 @@ func (module *GiteaPagesModule) UnmarshalCaddyfile(d *caddyfile.Dispenser) error
 func (module GiteaPagesModule) ServeHTTP(writer http.ResponseWriter, request *http.Request, _ caddyhttp.Handler) error {
 
 	var organization, repository, path string
-
-	// the path might  have url query parameters e.g. "?h=vpn" - this need to be stripped of
-	parsedUrl, _ := url.Parse(request.URL.Path)
-	parsedUrl.RawQuery = "" // Clear the query parameters
-	path = parsedUrl.String()
-
 	if module.URLScheme == "simple" {
 		// "Simple" URL case - we expect the organization and repository in the URL
 		// The URL/path looks like http(s)://<giteaserver>[:<port>]/<organization>/<repository>[/<filepath>]
 
 		// Remove a potential "/" prefix and trailing "/" -  then split up the path
-		parts := strings.Split(strings.TrimSuffix(strings.TrimPrefix(path, "/"), "/"), "/")
+		parts := strings.Split(strings.TrimSuffix(strings.TrimPrefix(request.URL.Path, "/"), "/"), "/")
 
 		length := len(parts)
 		if length <= 1 {
@@ -137,19 +125,15 @@ func (module GiteaPagesModule) ServeHTTP(writer http.ResponseWriter, request *ht
 		organization = strings.Split(request.Host, ".")[0]
 
 		// Remove a potential "/" prefix and trailing "/" -  then split up the path
-		path = strings.TrimSuffix(strings.TrimPrefix(path, "/"), "/")
+		path = strings.TrimSuffix(strings.TrimPrefix(request.URL.Path, "/"), "/")
 
 		if path == "" {
 			// Case http(s)://<organization>.<giteaserver>[:<port>]
 			// (Try to) Use of the pages repository in the specified organization
 
-			// Determine name of the default repository for organization based on settings
+			// We use github.com conventions: <organization>.github.io
-			if module.PagesRepository != "" {
+			// repository = organization + "." + module.PostfixPagesRepository
-				repository = module.PagesRepository
+			repository = module.PostfixPagesRepository
-			} else {
-				// We use github.com conventions: <organization>.github.io
-				repository = organization + "." + module.PostfixPagesRepository
-			}
 			path = "index.html"
 
 		} else {
@@ -169,13 +153,8 @@ func (module GiteaPagesModule) ServeHTTP(writer http.ResponseWriter, request *ht
 				}
 			} else {
 				// (Try to) Use of the pages repository in the specified organization
-				// Determine name of the default repository for organization based on settings
+				// We use github.com conventions: <organization>.github.io
-				if module.PagesRepository != "" {
+				repository = organization + "." + module.PostfixPagesRepository
-					repository = module.PagesRepository
-				} else {
-					// We use github.com conventions: <organization>.github.io
-					repository = organization + "." + module.PostfixPagesRepository
-				}
 				path = strings.Join(parts[0:], "/")
 			}
 		}
@@ -184,20 +163,11 @@ func (module GiteaPagesModule) ServeHTTP(writer http.ResponseWriter, request *ht
 	// Handle request
 	content, err := module.getFile(organization, repository, module.PagesBranch, path)
 	if err != nil {
-		module.Logger.Error("Unable to retrieve file: " + path + " - error: " + err.Error())
+		return caddyhttp.Error(http.StatusNotFound, err)
-
-		// append an index.html and retry
-		path = path + "/index.html"
-		content, err = module.getFile(organization, repository, module.PagesBranch, path)
-		if err != nil {
-			module.Logger.Error("Unable to retrieve file: " + path + " - error: " + err.Error())
-			return caddyhttp.Error(http.StatusNotFound, err)
-		}
-		// return caddyhttp.Error(http.StatusNotFound, err)
 	}
 
 	// Try to determine mime type based on extenstion of file
-	parts := strings.Split(path, ".")
+	parts := strings.Split(request.URL.Path, ".")
 	if len(parts) > 1 {
 		extension := parts[len(parts)-1] // get file extension
 		writer.Header().Add("Content-Type", mime.TypeByExtension("."+extension))
@@ -225,6 +195,21 @@ func (module GiteaPagesModule) repoBranchExists(organization, repository, branch
 	return branchInfo.Name == branch
 }
 
+// Check if a repo has a specific topic assigned
+func (module GiteaPagesModule) topicExists(organization, repository, topic string) bool {
+	topics, _, err := module.GiteaClient.ListRepoTopics(organization, repository, gitea.ListRepoTopicsOptions{})
+	if err != nil {
+		return false
+	}
+
+	for _, topicName := range topics {
+		if topicName == topic {
+			return true
+		}
+	}
+	return false
+}
+
 // Interface guards
 var (
 	_ caddy.Provisioner           = (*GiteaPagesModule)(nil)