Browse Source

Fix patch files

The `EnableTelemetry` flag was moved and `hacdias/filemanager` is now
`filebrowser/caddy/filemanager`.

Build still fails because it is blocked by https://github.com/filebrowser/filebrowser/pull/496 .
master
Andreas Linz 2 years ago
parent
commit
c84e6ace5a
Signed by: alinz GPG Key ID: 9BF39809C9DA580C
2 changed files with 9 additions and 9 deletions
  1. +5
    -5
      build/caddy/disable-telemetry.patch
  2. +4
    -4
      build/caddy/plugins.patch

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

@ -1,10 +1,10 @@
diff --git a/caddy/caddymain/run.go b/caddy/caddymain/run.go
index 4c8adcb..c1f6375 100644
index e17fdde..ef84b70 100644
--- a/caddy/caddymain/run.go
+++ b/caddy/caddymain/run.go
@@ -434,4 +434,4 @@ var (
gitFilesModified string // git diff-index --name-only HEAD
@@ -525,4 +525,4 @@ var (
)
-const enableTelemetry = true
+const enableTelemetry = false
// This variable defines whether telemetry is enabled in Run.
-var EnableTelemetry = true
+var EnableTelemetry = false

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

@ -1,27 +1,27 @@
diff --git a/caddy/caddymain/run.go b/caddy/caddymain/run.go
index 4c8adcb..abc5854 100644
index e17fdde..8f8fbfc 100644
--- a/caddy/caddymain/run.go
+++ b/caddy/caddymain/run.go
@@ -37,6 +37,22 @@ import (
@@ -38,6 +38,22 @@ import (
_ "github.com/mholt/caddy/caddyhttp" // plug in the HTTP server type
// This is where other plugins get plugged in (imported)
+
+ _ "blitznote.com/src/caddy.upload"
+ _ "github.com/SchumacherFM/mailout"
+ _ "github.com/caddyserver/forwardproxy"
+ _ "github.com/captncraig/caddy-realip"
+ _ "github.com/captncraig/cors"
+ _ "github.com/echocat/caddy-filter"
+ _ "github.com/filebrowser/caddy/filemanager"
+ _ "github.com/hacdias/caddy-minify"
+ _ "github.com/hacdias/caddy-webdav"
+ _ "github.com/hacdias/filemanager"
+ _ "github.com/jung-kurt/caddy-cgi"
+ _ "github.com/miekg/caddy-prometheus"
+ _ "github.com/nicolasazrak/caddy-cache"
+ _ "github.com/pyed/ipfilter"
+ _ "github.com/restic/caddy"
+ _ "github.com/xuqingfeng/caddy-rate-limit"
+ _ "blitznote.com/src/caddy.upload"
)
func init() {

Loading…
Cancel
Save