Browse Source

Upate caddy to 1.0.3

master
Andreas Linz 1 year ago
parent
commit
2d79d2b598
Signed by: alinz GPG Key ID: 9BF39809C9DA580C
2 changed files with 6 additions and 6 deletions
  1. +3
    -3
      build/caddy/Makefile
  2. +3
    -3
      build/caddy/plugins.patch

+ 3
- 3
build/caddy/Makefile View File

@ -1,12 +1,12 @@
.PHONY: clean
VERSION :=v1.0.2
VERSION :=v1.0.3
CADDY_SRC :=caddy-src-$(VERSION)
all: caddy
caddy: $(CADDY_SRC) checkout-version patch
cd $(CADDY_SRC) && go build -o ../$@ github.com/mholt/caddy/caddy
cd $(CADDY_SRC) && GO111MODULE=on go build -o ../$@ github.com/caddyserver/caddy/caddy
patch: $(CADDY_SRC)
cd $(CADDY_SRC)\
@ -14,7 +14,7 @@ patch: $(CADDY_SRC)
&& git apply ../disable-telemetry.patch
$(CADDY_SRC):
git clone https://github.com/mholt/caddy.git $@
git clone https://github.com/caddyserver/caddy.git $@
checkout-version: $(CADDY_SRC)
cd $(CADDY_SRC) && git checkout --force --quiet $(VERSION)

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

@ -1,10 +1,10 @@
diff --git a/caddy/caddymain/run.go b/caddy/caddymain/run.go
index e9ce689b..56a4b096 100644
index 9dbc54ca..695a5dd1 100644
--- a/caddy/caddymain/run.go
+++ b/caddy/caddymain/run.go
@@ -40,6 +40,21 @@ import (
@@ -40,6 +40,19 @@ import (
_ "github.com/mholt/caddy/caddyhttp" // plug in the HTTP server type
_ "github.com/caddyserver/caddy/caddyhttp" // plug in the HTTP server type
// This is where other plugins get plugged in (imported)
+
+ _ "github.com/SchumacherFM/mailout"

Loading…
Cancel
Save