upgrade caddy to 2.10.x

Author: ExplodingDragon

Dockerfile

@@ -1,9 +1,9 @@
-FROM docker.io/library/caddy:2.8-builder-alpine as builder
+FROM docker.io/library/caddy:2.10-builder-alpine as builder
 RUN mkdir -p /usr/local/src
 COPY go.mod go.sum caddyfile.go /usr/local/src/
 COPY pages /usr/local/src/pages
 WORKDIR /usr/local/src
 RUN ls && xcaddy build \
     --with github.com/d7z-project/caddy-gitea-pages=./
-FROM docker.io/library/caddy:2.8
+FROM docker.io/library/caddy:2.10
 COPY --from=builder  /usr/local/src/caddy /usr/bin/caddy

Makefile

@@ -1,7 +1,7 @@
-VERSION := 0.0.2
+VERSION := 0.0.3
 
 dev:
-	@xcaddy run v2.8.4 -c Caddyfile.local
+	@xcaddy run v2.10.0 -c Caddyfile.local
 
 fmt:
 	@go fmt

README.en.md

@@ -0,0 +1,79 @@
+# Gitea Pages
+
+English|[中文](README.md)
+
+> Gitea Pages implementation inspired by Github Pages  
+> This project is currently in maintenance mode. You may also check out my other project: [d7z-project/gitea-pages](https://github.com/d7z-project/gitea-pages)
+
+## Installation Guide
+
+The `xcaddy` tool is required for this step. Use the following command to generate the Caddy executable.  
+If `xcaddy` is not installed, download it from [caddyserver/xcaddy](https://github.com/caddyserver/xcaddy/releases) first.  
+Additionally, ensure Golang 1.24 is installed.
+
+```bash
+xcaddy build v2.10.0 --with github.com/d7z-project/caddy-gitea-pages
+# List current modules
+./caddy list-modules | grep gitea
+```
+
+This project also provides Docker images for `linux/amd64` and `linux/arm64`:
+
+```bash
+docker pull ghcr.io/d7z-project/caddy-gitea-pages:nightly
+```
+
+For configuration details, refer to the `docker.io/library/caddy` image.
+
+## Configuration Guide
+
+After installing Caddy, add the following configuration to your `Caddyfile`:
+
+```conf
+{
+    order gitea before file_server
+}
+
+:80
+gitea {
+   # Gitea server address
+   server https://gitea.com
+   # Gitea Token
+   token please-replace-it
+   # Default domain, similar to Github's github.io
+   domain example.com
+}
+```
+
+The token requires the following permissions:  
+- `organization:read`  
+- `repository:read`  
+- `user:read`  
+
+For more detailed configurations, see [Caddyfile](./Caddyfile).
+
+## Usage Instructions
+
+The repository `https://gitea.com/owner/repo.git` corresponds to `owner.example.com/repo` in the example configuration.  
+
+To access domains configured via `CNAME`, you must first visit the repository's `<owner>.example.com/<repo>` URL. This step only needs to be performed once.  
+
+**Note**: The repository must have a `gh-pages` branch containing an `index.html` file for access. If issues persist after configuration, restart Caddy to clear the cache.  
+
+### Fallback Strategy  
+- Appends `index.html` automatically when the URL ends with `/`.  
+- If a file is not found and `404.html` exists, it will be served with a 404 status code.  
+- For repositories tagged with `routes-history` or `routes-hash`, the fallback uses `index.html` with a 200 status code by default.  
+
+## TODO  
+- [x] Support CNAME custom paths (HTTP mode only, no ACME handling)  
+- [x] Support content caching  
+- [ ] Optimize concurrency model and race condition handling  
+- [ ] Support HTTP Range for resumable downloads  
+- [ ] Support OAuth2 login for private page access  
+
+## Acknowledgments  
+This project references [42wim/caddy-gitea](https://github.com/42wim/caddy-gitea).  
+
+## LICENSE  
+This project is licensed under [Apache-2.0](./LICENSE).  

README.md

@@ -1,17 +1,18 @@
 # Gitea Pages
 
-[English (Google TR)](./README_en.md) | 中文
+[English](./README.en.md)|中文
 
 > 参照 Github Pages 实现的 Gitea Pages
+> 当前项目处于维护模式，你也可以看看我的另一个项目 [d7z-project/gitea-pages](https://github.com/d7z-project/gitea-pages)
 
 ## 安装说明
 
 此处需要用到 `xcaddy` 工具，使用如下命令生成 Caddy 执行文件，
 如果 `xcaddy` 不存在，需先前往 [caddyserver/xcaddy](https://github.com/caddyserver/xcaddy/releases) 安装 `xcaddy`,
-同时安装好 Golang 1.22
+同时安装好 Golang 1.24
 
 ```bash
-xcaddy build v2.8.4 --with github.com/d7z-project/caddy-gitea-pages
+xcaddy build v2.10.0 --with github.com/d7z-project/caddy-gitea-pages
 # 列出当前模块
 ./caddy list-modules | grep gitea
 ```

README_en.md

@@ -1,127 +1,130 @@
 module github.com/d7z-project/caddy-gitea-pages
 
-go 1.22.4
-toolchain go1.24.1
+go 1.24
 
 require (
-	code.gitea.io/sdk/gitea v0.18.0
-	github.com/Masterminds/sprig/v3 v3.2.3
-	github.com/caddyserver/caddy/v2 v2.8.4
+	code.gitea.io/sdk/gitea v0.21.0
+	github.com/Masterminds/sprig/v3 v3.3.0
+	github.com/caddyserver/caddy/v2 v2.10.0
 	github.com/orcaman/concurrent-map/v2 v2.0.1
 )
 
 require (
-	github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9
+	github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/pkg/errors v0.9.1
 	go.uber.org/zap v1.27.0
 )
 
 require (
+	cel.dev/expr v0.24.0 // indirect
+	dario.cat/mergo v1.0.2 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
+	github.com/42wim/httpsig v1.2.3 // indirect
 	github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
+	github.com/KimMachineGun/automemlimit v0.7.2 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
-	github.com/Masterminds/semver/v3 v3.2.1 // indirect
+	github.com/Masterminds/semver/v3 v3.3.1 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
 	github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/caddyserver/certmagic v0.21.3 // indirect
+	github.com/caddyserver/certmagic v0.23.0 // indirect
 	github.com/caddyserver/zerossl v0.1.3 // indirect
+	github.com/ccoveille/go-safecast v1.6.1 // indirect
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/chzyer/readline v1.5.1 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
+	github.com/cloudflare/circl v1.6.1 // indirect
+	github.com/coreos/go-oidc/v3 v3.14.1 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
 	github.com/davidmz/go-pageant v1.0.2 // indirect
 	github.com/dgraph-io/badger v1.6.2 // indirect
 	github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
-	github.com/dgraph-io/ristretto v0.1.1 // indirect
-	github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
+	github.com/dgraph-io/ristretto v0.2.0 // indirect
+	github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/francoispqt/gojay v1.2.13 // indirect
 	github.com/go-fed/httpsig v1.1.0 // indirect
 	github.com/go-jose/go-jose/v3 v3.0.4 // indirect
-	github.com/go-kit/kit v0.13.0 // indirect
-	github.com/go-kit/log v0.2.1 // indirect
-	github.com/go-logfmt/logfmt v0.6.0 // indirect
-	github.com/go-sql-driver/mysql v1.8.1 // indirect
+	github.com/go-jose/go-jose/v4 v4.1.0 // indirect
+	github.com/go-sql-driver/mysql v1.9.2 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
-	github.com/golang/glog v1.2.4 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/cel-go v0.20.1 // indirect
-	github.com/google/pprof v0.0.0-20240528025155-186aa0362fba // indirect
+	github.com/golang/snappy v1.0.0 // indirect
+	github.com/google/cel-go v0.25.0 // indirect
+	github.com/google/pprof v0.0.0-20250602020802-c6617b811d0e // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect
-	github.com/huandu/xstrings v1.4.0 // indirect
-	github.com/imdario/mergo v0.3.16 // indirect
+	github.com/huandu/xstrings v1.5.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
-	github.com/jackc/pgconn v1.14.3 // indirect
-	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgproto3/v2 v2.3.3 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
-	github.com/jackc/pgtype v1.14.3 // indirect
-	github.com/jackc/pgx/v4 v4.18.3 // indirect
-	github.com/klauspost/compress v1.17.8 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
-	github.com/libdns/libdns v0.2.2 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
+	github.com/jackc/pgx/v5 v5.7.5 // indirect
+	github.com/jackc/puddle/v2 v2.2.2 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
+	github.com/libdns/libdns v1.1.0 // indirect
 	github.com/manifoldco/promptui v0.9.0 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
-	github.com/mholt/acmez/v2 v2.0.1 // indirect
-	github.com/miekg/dns v1.1.59 // indirect
+	github.com/mholt/acmez/v3 v3.1.2 // indirect
+	github.com/miekg/dns v1.1.66 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-ps v1.0.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/onsi/ginkgo/v2 v2.19.0 // indirect
-	github.com/prometheus/client_golang v1.19.1 // indirect
-	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.53.0 // indirect
-	github.com/prometheus/procfs v0.15.0 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/onsi/ginkgo/v2 v2.23.4 // indirect
+	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
+	github.com/prometheus/client_golang v1.22.0 // indirect
+	github.com/prometheus/client_model v0.6.2 // indirect
+	github.com/prometheus/common v0.64.0 // indirect
+	github.com/prometheus/procfs v0.16.1 // indirect
 	github.com/quic-go/qpack v0.5.1 // indirect
-	github.com/quic-go/quic-go v0.48.2 // indirect
-	github.com/rs/xid v1.5.0 // indirect
+	github.com/quic-go/quic-go v0.52.0 // indirect
+	github.com/rs/xid v1.6.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/shopspring/decimal v1.4.0 // indirect
 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
-	github.com/slackhq/nebula v1.9.1 // indirect
-	github.com/smallstep/certificates v0.26.1 // indirect
-	github.com/smallstep/nosql v0.6.1 // indirect
-	github.com/smallstep/pkcs7 v0.0.0-20240411202544-a82ada2bab6b // indirect
-	github.com/smallstep/scep v0.0.0-20240214080410-892e41795b99 // indirect
+	github.com/slackhq/nebula v1.9.5 // indirect
+	github.com/smallstep/certificates v0.28.3 // indirect
+	github.com/smallstep/cli-utils v0.12.1 // indirect
+	github.com/smallstep/linkedca v0.23.0 // indirect
+	github.com/smallstep/nosql v0.7.0 // indirect
+	github.com/smallstep/pkcs7 v0.2.1 // indirect
+	github.com/smallstep/scep v0.0.0-20250318231241-a25cabb69492 // indirect
 	github.com/smallstep/truststore v0.13.0 // indirect
-	github.com/spf13/cast v1.6.0 // indirect
-	github.com/spf13/cobra v1.8.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/cast v1.9.2 // indirect
+	github.com/spf13/cobra v1.9.1 // indirect
+	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/stoewer/go-strcase v1.3.0 // indirect
-	github.com/tailscale/tscert v0.0.0-20240517230440-bbccfbf48933 // indirect
-	github.com/urfave/cli v1.22.15 // indirect
-	github.com/zeebo/blake3 v0.2.3 // indirect
-	go.etcd.io/bbolt v1.3.10 // indirect
-	go.step.sm/cli-utils v0.9.0 // indirect
-	go.step.sm/crypto v0.46.0 // indirect
-	go.step.sm/linkedca v0.20.1 // indirect
-	go.uber.org/automaxprocs v1.5.3 // indirect
-	go.uber.org/mock v0.4.0 // indirect
+	github.com/tailscale/tscert v0.0.0-20240608151842-d3f834017e53 // indirect
+	github.com/urfave/cli v1.22.16 // indirect
+	github.com/zeebo/blake3 v0.2.4 // indirect
+	go.etcd.io/bbolt v1.4.0 // indirect
+	go.step.sm/crypto v0.66.0 // indirect
+	go.uber.org/automaxprocs v1.6.0 // indirect
+	go.uber.org/mock v0.5.2 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/zap/exp v0.2.0 // indirect
-	golang.org/x/crypto v0.36.0 // indirect
-	golang.org/x/crypto/x509roots/fallback v0.0.0-20240529182030-349231f7e4e4 // indirect
-	golang.org/x/exp v0.0.0-20240529005216-23cca8864a10 // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/net v0.38.0 // indirect
-	golang.org/x/sync v0.12.0 // indirect
-	golang.org/x/sys v0.31.0 // indirect
-	golang.org/x/term v0.30.0 // indirect
-	golang.org/x/text v0.23.0 // indirect
-	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
-	google.golang.org/grpc v1.64.1 // indirect
-	google.golang.org/protobuf v1.34.1 // indirect
+	go.uber.org/zap/exp v0.3.0 // indirect
+	golang.org/x/crypto v0.38.0 // indirect
+	golang.org/x/crypto/x509roots/fallback v0.0.0-20250531095911-4f9f0ca9fcfb // indirect
+	golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b // indirect
+	golang.org/x/mod v0.24.0 // indirect
+	golang.org/x/net v0.40.0 // indirect
+	golang.org/x/oauth2 v0.30.0 // indirect
+	golang.org/x/sync v0.14.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/term v0.32.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
+	golang.org/x/time v0.11.0 // indirect
+	golang.org/x/tools v0.33.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
+	google.golang.org/grpc v1.72.2 // indirect
+	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	howett.net/plist v1.0.1 // indirect
 )