Browse Source

Update caddy to 1.0.0

Remove custom GOPATH handling and use go modules support to build caddy.
This removes filebrowser or filemanager and restic/caddy plugins which are now
incompatible.
master
Andreas Linz 1 year ago
parent
commit
2e1b986e85
Signed by: alinz GPG Key ID: 9BF39809C9DA580C
3 changed files with 8 additions and 14 deletions
  1. +4
    -10
      build/caddy/Makefile
  2. +2
    -2
      build/caddy/disable-telemetry.patch
  3. +2
    -2
      build/caddy/plugins.patch

+ 4
- 10
build/caddy/Makefile View File

@ -1,18 +1,12 @@
.PHONY: clean
VERSION :=v0.11.3
CADDY_SRC:=caddy-src-$(VERSION)
GOPATH :=$(shell pwd)/$(CADDY_SRC)/.go
VERSION :=v1.0.0
CADDY_SRC :=caddy-src-$(VERSION)
all: caddy
caddy: $(CADDY_SRC) checkout-version patch $(GOPATH)
cd $(CADDY_SRC) && go get -v github.com/mholt/caddy/caddy
cp $(GOPATH)/bin/$@ $@
$(GOPATH): $(CADDY_SRC)
mkdir -p $@/src/github.com/mholt
ln -sf $(shell pwd)/$(CADDY_SRC) $(GOPATH)/src/github.com/mholt/caddy
caddy: $(CADDY_SRC) checkout-version patch
cd $(CADDY_SRC) && go build -o ../$@ github.com/mholt/caddy/caddy
patch: $(CADDY_SRC)
cd $(CADDY_SRC)\

+ 2
- 2
build/caddy/disable-telemetry.patch View File

@ -1,8 +1,8 @@
diff --git a/caddy/caddymain/run.go b/caddy/caddymain/run.go
index 446dc32..9d2360c 100644
index e9ce689b..7988ec75 100644
--- a/caddy/caddymain/run.go
+++ b/caddy/caddymain/run.go
@@ -559,4 +559,4 @@ var (
@@ -598,4 +598,4 @@ var (
)
// EnableTelemetry defines whether telemetry is enabled in Run.

+ 2
- 2
build/caddy/plugins.patch View File

@ -1,8 +1,8 @@
diff --git a/caddy/caddymain/run.go b/caddy/caddymain/run.go
index e17fdde..8f8fbfc 100644
index e9ce689b..56a4b096 100644
--- a/caddy/caddymain/run.go
+++ b/caddy/caddymain/run.go
@@ -38,6 +38,21 @@ import (
@@ -40,6 +40,21 @@ import (
_ "github.com/mholt/caddy/caddyhttp" // plug in the HTTP server type
// This is where other plugins get plugged in (imported)

Loading…
Cancel
Save