From f5720fecd663f521d832c1bca69e52ece43dc2b1 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Tue, 2 Jul 2019 12:49:20 -0600 Subject: [PATCH] Change all import paths: mholt/caddy -> caddyserver/caddy Includes updating go.mod to use new module path --- .github/CONTRIBUTING.md | 16 +++---- README.md | 28 ++++++------ caddy.go | 6 +-- caddy/caddymain/run.go | 12 ++--- caddy/main.go | 2 +- caddy_test.go | 2 +- caddyhttp/basicauth/basicauth.go | 2 +- caddyhttp/basicauth/basicauth_test.go | 4 +- caddyhttp/basicauth/setup.go | 4 +- caddyhttp/basicauth/setup_test.go | 4 +- caddyhttp/bind/bind.go | 4 +- caddyhttp/bind/bind_test.go | 4 +- caddyhttp/browse/browse.go | 4 +- caddyhttp/browse/browse_test.go | 4 +- caddyhttp/browse/setup.go | 6 +-- caddyhttp/browse/setup_test.go | 4 +- caddyhttp/caddyhttp.go | 56 ++++++++++++------------ caddyhttp/caddyhttp_test.go | 2 +- caddyhttp/errors/errors.go | 6 +-- caddyhttp/errors/errors_test.go | 2 +- caddyhttp/errors/setup.go | 4 +- caddyhttp/errors/setup_test.go | 4 +- caddyhttp/expvar/expvar.go | 2 +- caddyhttp/expvar/expvar_test.go | 2 +- caddyhttp/expvar/setup.go | 4 +- caddyhttp/expvar/setup_test.go | 4 +- caddyhttp/extensions/ext.go | 2 +- caddyhttp/extensions/setup.go | 4 +- caddyhttp/extensions/setup_test.go | 4 +- caddyhttp/fastcgi/fastcgi.go | 6 +-- caddyhttp/fastcgi/fastcgi_test.go | 4 +- caddyhttp/fastcgi/setup.go | 4 +- caddyhttp/fastcgi/setup_test.go | 4 +- caddyhttp/gzip/gzip.go | 6 +-- caddyhttp/gzip/gzip_test.go | 2 +- caddyhttp/gzip/requestfilter.go | 2 +- caddyhttp/gzip/responsefilter_test.go | 2 +- caddyhttp/gzip/setup.go | 4 +- caddyhttp/gzip/setup_test.go | 4 +- caddyhttp/header/header.go | 2 +- caddyhttp/header/header_test.go | 2 +- caddyhttp/header/setup.go | 4 +- caddyhttp/header/setup_test.go | 4 +- caddyhttp/httpserver/condition.go | 2 +- caddyhttp/httpserver/condition_test.go | 2 +- caddyhttp/httpserver/https.go | 4 +- caddyhttp/httpserver/https_test.go | 2 +- caddyhttp/httpserver/logger.go | 2 +- caddyhttp/httpserver/middleware.go | 2 +- caddyhttp/httpserver/mitm.go | 4 +- caddyhttp/httpserver/plugin.go | 10 ++--- caddyhttp/httpserver/plugin_test.go | 4 +- caddyhttp/httpserver/replacer.go | 4 +- caddyhttp/httpserver/replacer_test.go | 2 +- caddyhttp/httpserver/server.go | 8 ++-- caddyhttp/httpserver/siteconfig.go | 2 +- caddyhttp/httpserver/tplcontext.go | 2 +- caddyhttp/index/index.go | 4 +- caddyhttp/index/index_test.go | 6 +-- caddyhttp/internalsrv/internal.go | 2 +- caddyhttp/internalsrv/internal_test.go | 2 +- caddyhttp/internalsrv/setup.go | 4 +- caddyhttp/internalsrv/setup_test.go | 4 +- caddyhttp/limits/handler.go | 2 +- caddyhttp/limits/handler_test.go | 2 +- caddyhttp/limits/setup.go | 4 +- caddyhttp/limits/setup_test.go | 4 +- caddyhttp/log/log.go | 4 +- caddyhttp/log/log_test.go | 2 +- caddyhttp/log/setup.go | 4 +- caddyhttp/log/setup_test.go | 4 +- caddyhttp/markdown/markdown.go | 2 +- caddyhttp/markdown/markdown_test.go | 4 +- caddyhttp/markdown/process.go | 6 +-- caddyhttp/markdown/process_test.go | 2 +- caddyhttp/markdown/setup.go | 4 +- caddyhttp/markdown/setup_test.go | 4 +- caddyhttp/markdown/template.go | 4 +- caddyhttp/mime/mime.go | 2 +- caddyhttp/mime/mime_test.go | 2 +- caddyhttp/mime/setup.go | 4 +- caddyhttp/mime/setup_test.go | 4 +- caddyhttp/pprof/pprof.go | 2 +- caddyhttp/pprof/pprof_test.go | 2 +- caddyhttp/pprof/setup.go | 4 +- caddyhttp/pprof/setup_test.go | 2 +- caddyhttp/proxy/proxy.go | 2 +- caddyhttp/proxy/proxy_test.go | 4 +- caddyhttp/proxy/reverseproxy.go | 6 +-- caddyhttp/proxy/setup.go | 4 +- caddyhttp/proxy/setup_test.go | 4 +- caddyhttp/proxy/upstream.go | 6 +-- caddyhttp/proxy/upstream_test.go | 2 +- caddyhttp/push/handler.go | 2 +- caddyhttp/push/handler_test.go | 2 +- caddyhttp/push/push.go | 2 +- caddyhttp/push/setup.go | 4 +- caddyhttp/push/setup_test.go | 4 +- caddyhttp/redirect/redirect.go | 2 +- caddyhttp/redirect/redirect_test.go | 2 +- caddyhttp/redirect/setup.go | 4 +- caddyhttp/redirect/setup_test.go | 4 +- caddyhttp/requestid/requestid.go | 2 +- caddyhttp/requestid/requestid_test.go | 2 +- caddyhttp/requestid/setup.go | 4 +- caddyhttp/requestid/setup_test.go | 4 +- caddyhttp/rewrite/rewrite.go | 2 +- caddyhttp/rewrite/rewrite_test.go | 2 +- caddyhttp/rewrite/setup.go | 4 +- caddyhttp/rewrite/setup_test.go | 4 +- caddyhttp/rewrite/to.go | 2 +- caddyhttp/rewrite/to_test.go | 2 +- caddyhttp/root/root.go | 4 +- caddyhttp/root/root_test.go | 4 +- caddyhttp/staticfiles/fileserver.go | 2 +- caddyhttp/staticfiles/fileserver_test.go | 2 +- caddyhttp/status/setup.go | 4 +- caddyhttp/status/setup_test.go | 4 +- caddyhttp/status/status.go | 2 +- caddyhttp/status/status_test.go | 2 +- caddyhttp/templates/setup.go | 4 +- caddyhttp/templates/setup_test.go | 4 +- caddyhttp/templates/templates.go | 2 +- caddyhttp/templates/templates_test.go | 4 +- caddyhttp/timeouts/timeouts.go | 4 +- caddyhttp/timeouts/timeouts_test.go | 4 +- caddyhttp/websocket/setup.go | 4 +- caddyhttp/websocket/setup_test.go | 4 +- caddyhttp/websocket/websocket.go | 2 +- caddytls/config.go | 6 +-- caddytls/handshake.go | 2 +- caddytls/setup.go | 4 +- caddytls/setup_test.go | 2 +- caddytls/tls.go | 2 +- controller.go | 2 +- dist/LICENSES.txt | 2 +- dist/README.txt | 4 +- dist/init/linux-systemd/README.md | 2 +- go.mod | 2 +- onevent/hook/config.go | 2 +- onevent/hook/hook.go | 2 +- onevent/hook/hook_test.go | 2 +- onevent/on.go | 4 +- onevent/on_test.go | 4 +- plugins.go | 2 +- sigtrap.go | 2 +- sigtrap_posix.go | 2 +- 147 files changed, 292 insertions(+), 292 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 4cd91413..d2ec814c 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -23,7 +23,7 @@ Other menu items: ### Contributing code -You can have a direct impact on the project by helping with its code. To contribute code to Caddy, open a [pull request](https://github.com/mholt/caddy/pulls) (PR). If you're new to our community, that's okay: **we gladly welcome pull requests from anyone, regardless of your native language or coding experience.** You can get familiar with Caddy's code base by using [code search at Sourcegraph](https://sourcegraph.com/github.com/mholt/caddy/-/search). +You can have a direct impact on the project by helping with its code. To contribute code to Caddy, open a [pull request](https://github.com/caddyserver/caddy/pulls) (PR). If you're new to our community, that's okay: **we gladly welcome pull requests from anyone, regardless of your native language or coding experience.** You can get familiar with Caddy's code base by using [code search at Sourcegraph](https://sourcegraph.com/github.com/caddyserver/caddy/-/search). We hold contributions to a high standard for quality :bowtie:, so don't be surprised if we ask for revisions—even if it seems small or insignificant. Please don't take it personally. :wink: If your change is on the right track, we can guide you to make it mergable. @@ -52,9 +52,9 @@ We often grant [collaborator status](#collaborator-instructions) to contributors Contributing to Go projects on GitHub is fun and easy. We recommend the following workflow: -1. [Fork this repo](https://github.com/mholt/caddy). This makes a copy of the code you can write to. +1. [Fork this repo](https://github.com/caddyserver/caddy). This makes a copy of the code you can write to. -2. If you don't already have this repo (mholt/caddy.git) repo on your computer, get it with `go get github.com/mholt/caddy/caddy`. +2. If you don't already have this repo (mholt/caddy.git) repo on your computer, get it with `go get github.com/caddyserver/caddy/caddy`. 3. Tell git that it can push the mholt/caddy.git repo to your fork by adding a remote: `git remote add myfork https://github.com/you/caddy.git` @@ -62,7 +62,7 @@ Contributing to Go projects on GitHub is fun and easy. We recommend the followin 5. Push your changes to your fork: `git push myfork` -6. [Create a pull request](https://github.com/mholt/caddy/pull/new/master) to merge your changes into mholt/caddy @ master. (Click "compare across forks" and change the head fork.) +6. [Create a pull request](https://github.com/caddyserver/caddy/pull/new/master) to merge your changes into mholt/caddy @ master. (Click "compare across forks" and change the head fork.) This workflow is nice because you don't have to change import paths. You can get fancier by using different branches if you want. @@ -71,7 +71,7 @@ This workflow is nice because you don't have to change import paths. You can get Caddy can do more with plugins! Anyone can write a plugin. Plugins are Go libraries that get compiled into Caddy, extending its feature set. They can add directives to the Caddyfile, change how the Caddyfile is loaded, and even implement new server types (e.g. HTTP, DNS). When it's ready, you can submit your plugin to the Caddy website so others can download it. -[Learn how to write and submit a plugin](https://github.com/mholt/caddy/wiki) on the wiki. You should also share and discuss your plugin idea [on the forums](https://caddy.community) to have people test it out. We don't use the Caddy issue tracker for plugins. +[Learn how to write and submit a plugin](https://github.com/caddyserver/caddy/wiki) on the wiki. You should also share and discuss your plugin idea [on the forums](https://caddy.community) to have people test it out. We don't use the Caddy issue tracker for plugins. ### Getting help using Caddy @@ -83,7 +83,7 @@ Many people on the forums could benefit from your experience and expertise, too. ### Reporting bugs -Like every software, Caddy has its flaws. If you find one, [search the issues](https://github.com/mholt/caddy/issues) to see if it has already been reported. If not, [open a new issue](https://github.com/mholt/caddy/issues/new) and describe the bug, and somebody will look into it! (This repository is only for Caddy, not plugins.) +Like every software, Caddy has its flaws. If you find one, [search the issues](https://github.com/caddyserver/caddy/issues) to see if it has already been reported. If not, [open a new issue](https://github.com/caddyserver/caddy/issues/new) and describe the bug, and somebody will look into it! (This repository is only for Caddy, not plugins.) **You can help stop bugs in their tracks!** Speed up the patch by identifying the bug in the code. This can sometimes be done by adding `fmt.Println()` statements (or similar) in relevant code paths to narrow down where the problem may be. It's a good way to [introduce yourself to the Go language](https://tour.golang.org), too. @@ -96,9 +96,9 @@ Please be kind. :smile: Remember that Caddy comes at no cost to you, and you're ### Suggesting features -First, [search to see if your feature has already been requested](https://github.com/mholt/caddy/issues). If it has, you can add a :+1: reaction to vote for it. If your feature idea is new, open an issue to request the feature. You don't have to follow the bug template for feature requests. Please describe your idea thoroughly so that we know how to implement it! Really vague requests may not be helpful or actionable and without clarification will have to be closed. +First, [search to see if your feature has already been requested](https://github.com/caddyserver/caddy/issues). If it has, you can add a :+1: reaction to vote for it. If your feature idea is new, open an issue to request the feature. You don't have to follow the bug template for feature requests. Please describe your idea thoroughly so that we know how to implement it! Really vague requests may not be helpful or actionable and without clarification will have to be closed. -While we really do value your requests and implement many of them, not all features are a good fit for Caddy. Most of those [make good plugins](https://github.com/mholt/caddy/wiki), though, which can be made by anyone! But if a feature is not in the best interest of the Caddy project or its users in general, we may politely decline to implement it into Caddy core. +While we really do value your requests and implement many of them, not all features are a good fit for Caddy. Most of those [make good plugins](https://github.com/caddyserver/caddy/wiki), though, which can be made by anyone! But if a feature is not in the best interest of the Caddy project or its users in general, we may politely decline to implement it into Caddy core. ### Improving documentation diff --git a/README.md b/README.md index 2835e260..5139e93e 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,12 @@

Caddy is a general-purpose HTTP/2 web server that serves HTTPS by default.

- - + +
@caddyserver on Twitter Caddy Forum - Caddy on Sourcegraph + Caddy on Sourcegraph

Download ยท @@ -22,7 +22,7 @@ Caddy is a **production-ready** open-source web server that is fast, easy to use, and makes you more productive. -Available for Windows, Mac, Linux, BSD, Solaris, and [Android](https://github.com/mholt/caddy/wiki/Running-Caddy-on-Android). +Available for Windows, Mac, Linux, BSD, Solaris, and [Android](https://github.com/caddyserver/caddy/wiki/Running-Caddy-on-Android).

Thanks to our special sponsor: @@ -68,7 +68,7 @@ Altogether, Caddy can do things other web servers simply cannot do. Its features Caddy binaries have no dependencies and are available for every platform. Get Caddy any of these ways: - **[Download page](https://caddyserver.com/download)** (RECOMMENDED) allows you to customize your build in the browser -- **[Latest release](https://github.com/mholt/caddy/releases/latest)** for pre-built, vanilla binaries +- **[Latest release](https://github.com/caddyserver/caddy/releases/latest)** for pre-built, vanilla binaries - **[AWS Marketplace](https://aws.amazon.com/marketplace/pp/B07J1WNK75?qid=1539015041932&sr=0-1&ref_=srh_res_product_title&cl_spe=C)** makes it easy to deploy directly to your cloud environment. Get Caddy on the AWS Marketplace @@ -81,7 +81,7 @@ To build from source you need **[Git](https://git-scm.com/downloads)** and **[Go 1. Set the transitional environment variable for Go modules: `export GO111MODULE=on` -2. Run `go get github.com/mholt/caddy/caddy` +2. Run `go get github.com/caddyserver/caddy/caddy` Caddy will be installed to your `$GOPATH/bin` folder. @@ -98,7 +98,7 @@ There is no need to modify the Caddy code to build it with plugins. We will crea package main import ( - "github.com/mholt/caddy/caddy/caddymain" + "github.com/caddyserver/caddy/caddy/caddymain" // plug in plugins here, for example: // _ "import/path/here" @@ -111,14 +111,14 @@ func main() { } ``` 3. `go mod init caddy` -4. Run `go get github.com/mholt/caddy` +4. Run `go get github.com/caddyserver/caddy` 5. `go install` will then create your binary at `$GOPATH/bin`, or `go build` will put it in the current directory. **To install Caddy's source code for development:** 1. Set the transitional environment variable for Go modules: `export GO111MODULE=on` -2. Run `git clone https://github.com/mholt/caddy.git` in any folder (doesn't have to be in GOPATH). +2. Run `git clone https://github.com/caddyserver/caddy.git` in any folder (doesn't have to be in GOPATH). You can make changes to the source code from that clone and checkout any commit or tag you wish to develop on. @@ -182,7 +182,7 @@ Caddy is production-ready if you find it to be a good fit for your site and work **Running as root:** We advise against this. You can still listen on ports < 1024 on Linux using setcap like so: `sudo setcap cap_net_bind_service=+ep ./caddy` -The Caddy project does not officially maintain any system-specific integrations nor suggest how to administer your own system. But your download file includes [unofficial resources](https://github.com/mholt/caddy/tree/master/dist/init) contributed by the community that you may find helpful for running Caddy in production. +The Caddy project does not officially maintain any system-specific integrations nor suggest how to administer your own system. But your download file includes [unofficial resources](https://github.com/caddyserver/caddy/tree/master/dist/init) contributed by the community that you may find helpful for running Caddy in production. How you choose to run Caddy is up to you. Many users are satisfied with `nohup caddy &`. Others use `screen`. Users who need Caddy to come back up after reboots either do so in the script that caused the reboot, add a command to an init script, or configure a service with their OS. @@ -191,17 +191,17 @@ If you have questions or concerns about Caddy' underlying crypto implementations ## Contributing -**[Join our forum](https://caddy.community) where you can chat with other Caddy users and developers!** To get familiar with the code base, try [Caddy code search on Sourcegraph](https://sourcegraph.com/github.com/mholt/caddy/)! +**[Join our forum](https://caddy.community) where you can chat with other Caddy users and developers!** To get familiar with the code base, try [Caddy code search on Sourcegraph](https://sourcegraph.com/github.com/caddyserver/caddy/)! -Please see our [contributing guidelines](https://github.com/mholt/caddy/blob/master/.github/CONTRIBUTING.md) for instructions. If you want to write a plugin, check out the [developer wiki](https://github.com/mholt/caddy/wiki). +Please see our [contributing guidelines](https://github.com/caddyserver/caddy/blob/master/.github/CONTRIBUTING.md) for instructions. If you want to write a plugin, check out the [developer wiki](https://github.com/caddyserver/caddy/wiki). We use GitHub issues and pull requests only for discussing bug reports and the development of specific changes. We welcome all other topics on the [forum](https://caddy.community)! -If you want to contribute to the documentation, please [submit an issue](https://github.com/mholt/caddy/issues/new) describing the change that should be made. +If you want to contribute to the documentation, please [submit an issue](https://github.com/caddyserver/caddy/issues/new) describing the change that should be made. ### Good First Issue -If you are looking for somewhere to start and would like to help out by working on an existing issue, take a look at our [`Good First Issue`](https://github.com/mholt/caddy/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) tag +If you are looking for somewhere to start and would like to help out by working on an existing issue, take a look at our [`Good First Issue`](https://github.com/caddyserver/caddy/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) tag Thanks for making Caddy -- and the Web -- better! diff --git a/caddy.go b/caddy.go index 9f348087..9601ab2c 100644 --- a/caddy.go +++ b/caddy.go @@ -20,7 +20,7 @@ // 2. Call LoadCaddyfile() to get the Caddyfile. // Pass in the name of the server type (like "http"). // Make sure the server type's package is imported -// (import _ "github.com/mholt/caddy/caddyhttp"). +// (import _ "github.com/caddyserver/caddy/caddyhttp"). // 3. Call caddy.Start() to start Caddy. You get back // an Instance, on which you can call Restart() to // restart it or Stop() to stop it. @@ -43,8 +43,8 @@ import ( "sync" "time" - "github.com/mholt/caddy/caddyfile" - "github.com/mholt/caddy/telemetry" + "github.com/caddyserver/caddy/caddyfile" + "github.com/caddyserver/caddy/telemetry" ) // Configurable application parameters diff --git a/caddy/caddymain/run.go b/caddy/caddymain/run.go index e9ce689b..c7705161 100644 --- a/caddy/caddymain/run.go +++ b/caddy/caddymain/run.go @@ -31,14 +31,14 @@ import ( "github.com/google/uuid" "github.com/klauspost/cpuid" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyfile" - "github.com/mholt/caddy/caddytls" - "github.com/mholt/caddy/telemetry" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyfile" + "github.com/caddyserver/caddy/caddytls" + "github.com/caddyserver/caddy/telemetry" "github.com/mholt/certmagic" lumberjack "gopkg.in/natefinch/lumberjack.v2" - _ "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) ) @@ -290,7 +290,7 @@ func getBuildModule() *debug.Module { // preserves caddy a read-only dependency // TODO: track related Go issue: https://github.com/golang/go/issues/29228 for _, mod := range bi.Deps { - if mod.Path == "github.com/mholt/caddy" { + if mod.Path == "github.com/caddyserver/caddy" { return mod } } diff --git a/caddy/main.go b/caddy/main.go index fc101c4a..879a10a1 100644 --- a/caddy/main.go +++ b/caddy/main.go @@ -19,7 +19,7 @@ package main -import "github.com/mholt/caddy/caddy/caddymain" +import "github.com/caddyserver/caddy/caddy/caddymain" var run = caddymain.Run // replaced for tests diff --git a/caddy_test.go b/caddy_test.go index 9b5527b0..498527e2 100644 --- a/caddy_test.go +++ b/caddy_test.go @@ -21,7 +21,7 @@ import ( "sync" "testing" - "github.com/mholt/caddy/caddyfile" + "github.com/caddyserver/caddy/caddyfile" ) /* diff --git a/caddyhttp/basicauth/basicauth.go b/caddyhttp/basicauth/basicauth.go index 93e79b97..81cd47f7 100644 --- a/caddyhttp/basicauth/basicauth.go +++ b/caddyhttp/basicauth/basicauth.go @@ -34,7 +34,7 @@ import ( "sync" "github.com/jimstudt/http-authentication/basic" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) // BasicAuth is middleware to protect resources with a username and password. diff --git a/caddyhttp/basicauth/basicauth_test.go b/caddyhttp/basicauth/basicauth_test.go index 0288f358..293c951c 100644 --- a/caddyhttp/basicauth/basicauth_test.go +++ b/caddyhttp/basicauth/basicauth_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestBasicAuth(t *testing.T) { @@ -110,7 +110,7 @@ func TestBasicAuth(t *testing.T) { } } else { if req.Header.Get("Authorization") == "" { - // see issue #1508: https://github.com/mholt/caddy/issues/1508 + // see issue #1508: https://github.com/caddyserver/caddy/issues/1508 t.Errorf("Test %d: Expected Authorization header to be retained after successful auth, but was empty", i) } } diff --git a/caddyhttp/basicauth/setup.go b/caddyhttp/basicauth/setup.go index 87627f17..ebc8cedc 100644 --- a/caddyhttp/basicauth/setup.go +++ b/caddyhttp/basicauth/setup.go @@ -17,8 +17,8 @@ package basicauth import ( "strings" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func init() { diff --git a/caddyhttp/basicauth/setup_test.go b/caddyhttp/basicauth/setup_test.go index 5de06762..ff7d8320 100644 --- a/caddyhttp/basicauth/setup_test.go +++ b/caddyhttp/basicauth/setup_test.go @@ -21,8 +21,8 @@ import ( "strings" "testing" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestSetup(t *testing.T) { diff --git a/caddyhttp/bind/bind.go b/caddyhttp/bind/bind.go index 79489fe4..bbc12528 100644 --- a/caddyhttp/bind/bind.go +++ b/caddyhttp/bind/bind.go @@ -15,8 +15,8 @@ package bind import ( - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func init() { diff --git a/caddyhttp/bind/bind_test.go b/caddyhttp/bind/bind_test.go index 27d7fdc7..7f9895cd 100644 --- a/caddyhttp/bind/bind_test.go +++ b/caddyhttp/bind/bind_test.go @@ -17,8 +17,8 @@ package bind import ( "testing" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestSetupBind(t *testing.T) { diff --git a/caddyhttp/browse/browse.go b/caddyhttp/browse/browse.go index fd09ad65..eab7c5e1 100644 --- a/caddyhttp/browse/browse.go +++ b/caddyhttp/browse/browse.go @@ -30,8 +30,8 @@ import ( "time" "github.com/dustin/go-humanize" - "github.com/mholt/caddy/caddyhttp/httpserver" - "github.com/mholt/caddy/caddyhttp/staticfiles" + "github.com/caddyserver/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/staticfiles" ) const ( diff --git a/caddyhttp/browse/browse_test.go b/caddyhttp/browse/browse_test.go index fd89127a..8f94b80a 100644 --- a/caddyhttp/browse/browse_test.go +++ b/caddyhttp/browse/browse_test.go @@ -31,8 +31,8 @@ import ( "text/template" "time" - "github.com/mholt/caddy/caddyhttp/httpserver" - "github.com/mholt/caddy/caddyhttp/staticfiles" + "github.com/caddyserver/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/staticfiles" ) const testDirPrefix = "caddy_browse_test" diff --git a/caddyhttp/browse/setup.go b/caddyhttp/browse/setup.go index 90b1646d..d730a329 100644 --- a/caddyhttp/browse/setup.go +++ b/caddyhttp/browse/setup.go @@ -20,9 +20,9 @@ import ( "net/http" "text/template" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" - "github.com/mholt/caddy/caddyhttp/staticfiles" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/staticfiles" ) func init() { diff --git a/caddyhttp/browse/setup_test.go b/caddyhttp/browse/setup_test.go index 93d3d087..6989ad4f 100644 --- a/caddyhttp/browse/setup_test.go +++ b/caddyhttp/browse/setup_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestSetup(t *testing.T) { diff --git a/caddyhttp/caddyhttp.go b/caddyhttp/caddyhttp.go index d9d97e9d..7ca8b874 100644 --- a/caddyhttp/caddyhttp.go +++ b/caddyhttp/caddyhttp.go @@ -16,34 +16,34 @@ package caddyhttp import ( // plug in the server - _ "github.com/mholt/caddy/caddyhttp/httpserver" + _ "github.com/caddyserver/caddy/caddyhttp/httpserver" // plug in the standard directives - _ "github.com/mholt/caddy/caddyhttp/basicauth" - _ "github.com/mholt/caddy/caddyhttp/bind" - _ "github.com/mholt/caddy/caddyhttp/browse" - _ "github.com/mholt/caddy/caddyhttp/errors" - _ "github.com/mholt/caddy/caddyhttp/expvar" - _ "github.com/mholt/caddy/caddyhttp/extensions" - _ "github.com/mholt/caddy/caddyhttp/fastcgi" - _ "github.com/mholt/caddy/caddyhttp/gzip" - _ "github.com/mholt/caddy/caddyhttp/header" - _ "github.com/mholt/caddy/caddyhttp/index" - _ "github.com/mholt/caddy/caddyhttp/internalsrv" - _ "github.com/mholt/caddy/caddyhttp/limits" - _ "github.com/mholt/caddy/caddyhttp/log" - _ "github.com/mholt/caddy/caddyhttp/markdown" - _ "github.com/mholt/caddy/caddyhttp/mime" - _ "github.com/mholt/caddy/caddyhttp/pprof" - _ "github.com/mholt/caddy/caddyhttp/proxy" - _ "github.com/mholt/caddy/caddyhttp/push" - _ "github.com/mholt/caddy/caddyhttp/redirect" - _ "github.com/mholt/caddy/caddyhttp/requestid" - _ "github.com/mholt/caddy/caddyhttp/rewrite" - _ "github.com/mholt/caddy/caddyhttp/root" - _ "github.com/mholt/caddy/caddyhttp/status" - _ "github.com/mholt/caddy/caddyhttp/templates" - _ "github.com/mholt/caddy/caddyhttp/timeouts" - _ "github.com/mholt/caddy/caddyhttp/websocket" - _ "github.com/mholt/caddy/onevent" + _ "github.com/caddyserver/caddy/caddyhttp/basicauth" + _ "github.com/caddyserver/caddy/caddyhttp/bind" + _ "github.com/caddyserver/caddy/caddyhttp/browse" + _ "github.com/caddyserver/caddy/caddyhttp/errors" + _ "github.com/caddyserver/caddy/caddyhttp/expvar" + _ "github.com/caddyserver/caddy/caddyhttp/extensions" + _ "github.com/caddyserver/caddy/caddyhttp/fastcgi" + _ "github.com/caddyserver/caddy/caddyhttp/gzip" + _ "github.com/caddyserver/caddy/caddyhttp/header" + _ "github.com/caddyserver/caddy/caddyhttp/index" + _ "github.com/caddyserver/caddy/caddyhttp/internalsrv" + _ "github.com/caddyserver/caddy/caddyhttp/limits" + _ "github.com/caddyserver/caddy/caddyhttp/log" + _ "github.com/caddyserver/caddy/caddyhttp/markdown" + _ "github.com/caddyserver/caddy/caddyhttp/mime" + _ "github.com/caddyserver/caddy/caddyhttp/pprof" + _ "github.com/caddyserver/caddy/caddyhttp/proxy" + _ "github.com/caddyserver/caddy/caddyhttp/push" + _ "github.com/caddyserver/caddy/caddyhttp/redirect" + _ "github.com/caddyserver/caddy/caddyhttp/requestid" + _ "github.com/caddyserver/caddy/caddyhttp/rewrite" + _ "github.com/caddyserver/caddy/caddyhttp/root" + _ "github.com/caddyserver/caddy/caddyhttp/status" + _ "github.com/caddyserver/caddy/caddyhttp/templates" + _ "github.com/caddyserver/caddy/caddyhttp/timeouts" + _ "github.com/caddyserver/caddy/caddyhttp/websocket" + _ "github.com/caddyserver/caddy/onevent" ) diff --git a/caddyhttp/caddyhttp_test.go b/caddyhttp/caddyhttp_test.go index 47b084a7..2bec04b7 100644 --- a/caddyhttp/caddyhttp_test.go +++ b/caddyhttp/caddyhttp_test.go @@ -18,7 +18,7 @@ import ( "strings" "testing" - "github.com/mholt/caddy" + "github.com/caddyserver/caddy" ) // TODO: this test could be improved; the purpose is to diff --git a/caddyhttp/errors/errors.go b/caddyhttp/errors/errors.go index fd09f8fb..5e10b2d0 100644 --- a/caddyhttp/errors/errors.go +++ b/caddyhttp/errors/errors.go @@ -24,8 +24,8 @@ import ( "strings" "time" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func init() { @@ -142,7 +142,7 @@ func (h ErrorHandler) recovery(w http.ResponseWriter, r *http.Request) { } // Trim file path - delim := "/github.com/mholt/caddy/" + delim := "/github.com/caddyserver/caddy/" pkgPathPos := strings.Index(file, delim) if pkgPathPos > -1 && len(file) > pkgPathPos+len(delim) { file = file[pkgPathPos+len(delim):] diff --git a/caddyhttp/errors/errors_test.go b/caddyhttp/errors/errors_test.go index 9fad9117..591d8d94 100644 --- a/caddyhttp/errors/errors_test.go +++ b/caddyhttp/errors/errors_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestErrors(t *testing.T) { diff --git a/caddyhttp/errors/setup.go b/caddyhttp/errors/setup.go index bcda1c8b..d37c81fc 100644 --- a/caddyhttp/errors/setup.go +++ b/caddyhttp/errors/setup.go @@ -20,8 +20,8 @@ import ( "path/filepath" "strconv" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) // setup configures a new errors middleware instance. diff --git a/caddyhttp/errors/setup_test.go b/caddyhttp/errors/setup_test.go index b13aecf0..74e0efa2 100644 --- a/caddyhttp/errors/setup_test.go +++ b/caddyhttp/errors/setup_test.go @@ -19,8 +19,8 @@ import ( "reflect" "testing" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestSetup(t *testing.T) { diff --git a/caddyhttp/expvar/expvar.go b/caddyhttp/expvar/expvar.go index efbfa32d..e662341d 100644 --- a/caddyhttp/expvar/expvar.go +++ b/caddyhttp/expvar/expvar.go @@ -19,7 +19,7 @@ import ( "fmt" "net/http" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) // ExpVar is a simple struct to hold expvar's configuration diff --git a/caddyhttp/expvar/expvar_test.go b/caddyhttp/expvar/expvar_test.go index cfada87c..cf88f8a2 100644 --- a/caddyhttp/expvar/expvar_test.go +++ b/caddyhttp/expvar/expvar_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestExpVar(t *testing.T) { diff --git a/caddyhttp/expvar/setup.go b/caddyhttp/expvar/setup.go index 79f2763b..e4f9cfc4 100644 --- a/caddyhttp/expvar/setup.go +++ b/caddyhttp/expvar/setup.go @@ -19,8 +19,8 @@ import ( "runtime" "sync" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func init() { diff --git a/caddyhttp/expvar/setup_test.go b/caddyhttp/expvar/setup_test.go index 4adf88c2..e12684df 100644 --- a/caddyhttp/expvar/setup_test.go +++ b/caddyhttp/expvar/setup_test.go @@ -17,8 +17,8 @@ package expvar import ( "testing" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestSetup(t *testing.T) { diff --git a/caddyhttp/extensions/ext.go b/caddyhttp/extensions/ext.go index b78f5792..eafa3532 100644 --- a/caddyhttp/extensions/ext.go +++ b/caddyhttp/extensions/ext.go @@ -26,7 +26,7 @@ import ( "path" "strings" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) // Ext can assume an extension from clean URLs. diff --git a/caddyhttp/extensions/setup.go b/caddyhttp/extensions/setup.go index 1261c49e..ded64bc3 100644 --- a/caddyhttp/extensions/setup.go +++ b/caddyhttp/extensions/setup.go @@ -15,8 +15,8 @@ package extensions import ( - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func init() { diff --git a/caddyhttp/extensions/setup_test.go b/caddyhttp/extensions/setup_test.go index 986c8b21..f050fa0a 100644 --- a/caddyhttp/extensions/setup_test.go +++ b/caddyhttp/extensions/setup_test.go @@ -17,8 +17,8 @@ package extensions import ( "testing" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestSetup(t *testing.T) { diff --git a/caddyhttp/fastcgi/fastcgi.go b/caddyhttp/fastcgi/fastcgi.go index f5c80dc5..f0e5327c 100644 --- a/caddyhttp/fastcgi/fastcgi.go +++ b/caddyhttp/fastcgi/fastcgi.go @@ -35,9 +35,9 @@ import ( "crypto/tls" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" - "github.com/mholt/caddy/caddytls" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddytls" ) // Handler is a middleware type that can handle requests as a FastCGI client. diff --git a/caddyhttp/fastcgi/fastcgi_test.go b/caddyhttp/fastcgi/fastcgi_test.go index ca892202..39c56262 100644 --- a/caddyhttp/fastcgi/fastcgi_test.go +++ b/caddyhttp/fastcgi/fastcgi_test.go @@ -28,8 +28,8 @@ import ( "testing" "time" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestServeHTTP(t *testing.T) { diff --git a/caddyhttp/fastcgi/setup.go b/caddyhttp/fastcgi/setup.go index 8034c641..06cb4b0a 100644 --- a/caddyhttp/fastcgi/setup.go +++ b/caddyhttp/fastcgi/setup.go @@ -23,8 +23,8 @@ import ( "strings" "time" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) var defaultTimeout = 60 * time.Second diff --git a/caddyhttp/fastcgi/setup_test.go b/caddyhttp/fastcgi/setup_test.go index b5d1ac5d..48ec0aa7 100644 --- a/caddyhttp/fastcgi/setup_test.go +++ b/caddyhttp/fastcgi/setup_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestSetup(t *testing.T) { diff --git a/caddyhttp/gzip/gzip.go b/caddyhttp/gzip/gzip.go index 619a1d57..52936555 100644 --- a/caddyhttp/gzip/gzip.go +++ b/caddyhttp/gzip/gzip.go @@ -22,8 +22,8 @@ import ( "net/http" "strings" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func init() { @@ -67,7 +67,7 @@ outer: } // In order to avoid unused memory allocation, gzip.putWriter only be called when gzip compression happened. - // see https://github.com/mholt/caddy/issues/2395 + // see https://github.com/caddyserver/caddy/issues/2395 gz := &gzipResponseWriter{ ResponseWriterWrapper: &httpserver.ResponseWriterWrapper{ResponseWriter: w}, newWriter: func() io.Writer { diff --git a/caddyhttp/gzip/gzip_test.go b/caddyhttp/gzip/gzip_test.go index 21520cac..368b8a77 100644 --- a/caddyhttp/gzip/gzip_test.go +++ b/caddyhttp/gzip/gzip_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestGzipHandler(t *testing.T) { diff --git a/caddyhttp/gzip/requestfilter.go b/caddyhttp/gzip/requestfilter.go index ee37776b..bb813619 100644 --- a/caddyhttp/gzip/requestfilter.go +++ b/caddyhttp/gzip/requestfilter.go @@ -18,7 +18,7 @@ import ( "net/http" "path" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) // RequestFilter determines if a request should be gzipped. diff --git a/caddyhttp/gzip/responsefilter_test.go b/caddyhttp/gzip/responsefilter_test.go index 1d0d2d09..ac2b4c1e 100644 --- a/caddyhttp/gzip/responsefilter_test.go +++ b/caddyhttp/gzip/responsefilter_test.go @@ -22,7 +22,7 @@ import ( "net/http/httptest" "testing" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestLengthFilter(t *testing.T) { diff --git a/caddyhttp/gzip/setup.go b/caddyhttp/gzip/setup.go index 275955c1..1a3ee68c 100644 --- a/caddyhttp/gzip/setup.go +++ b/caddyhttp/gzip/setup.go @@ -22,8 +22,8 @@ import ( "strings" "sync" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) // setup configures a new gzip middleware instance. diff --git a/caddyhttp/gzip/setup_test.go b/caddyhttp/gzip/setup_test.go index 364de59b..79ed4662 100644 --- a/caddyhttp/gzip/setup_test.go +++ b/caddyhttp/gzip/setup_test.go @@ -17,8 +17,8 @@ package gzip import ( "testing" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestSetup(t *testing.T) { diff --git a/caddyhttp/header/header.go b/caddyhttp/header/header.go index 884c5e40..982a3b21 100644 --- a/caddyhttp/header/header.go +++ b/caddyhttp/header/header.go @@ -21,7 +21,7 @@ import ( "net/http" "strings" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) // Headers is middleware that adds headers to the responses diff --git a/caddyhttp/header/header_test.go b/caddyhttp/header/header_test.go index 4b740543..a9f5aa8f 100644 --- a/caddyhttp/header/header_test.go +++ b/caddyhttp/header/header_test.go @@ -24,7 +24,7 @@ import ( "sort" "testing" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestHeader(t *testing.T) { diff --git a/caddyhttp/header/setup.go b/caddyhttp/header/setup.go index 99c173fb..4c6a1bf3 100644 --- a/caddyhttp/header/setup.go +++ b/caddyhttp/header/setup.go @@ -17,8 +17,8 @@ package header import ( "net/http" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func init() { diff --git a/caddyhttp/header/setup_test.go b/caddyhttp/header/setup_test.go index 6d98f3f7..bbb442b6 100644 --- a/caddyhttp/header/setup_test.go +++ b/caddyhttp/header/setup_test.go @@ -20,8 +20,8 @@ import ( "reflect" "testing" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestSetup(t *testing.T) { diff --git a/caddyhttp/httpserver/condition.go b/caddyhttp/httpserver/condition.go index 0b329092..e1fa7616 100644 --- a/caddyhttp/httpserver/condition.go +++ b/caddyhttp/httpserver/condition.go @@ -20,7 +20,7 @@ import ( "regexp" "strings" - "github.com/mholt/caddy" + "github.com/caddyserver/caddy" ) // SetupIfMatcher parses `if` or `if_op` in the current dispenser block. diff --git a/caddyhttp/httpserver/condition_test.go b/caddyhttp/httpserver/condition_test.go index f9045d30..55811ed4 100644 --- a/caddyhttp/httpserver/condition_test.go +++ b/caddyhttp/httpserver/condition_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/mholt/caddy" + "github.com/caddyserver/caddy" ) func TestConditions(t *testing.T) { diff --git a/caddyhttp/httpserver/https.go b/caddyhttp/httpserver/https.go index eb61ba23..b6c683a9 100644 --- a/caddyhttp/httpserver/https.go +++ b/caddyhttp/httpserver/https.go @@ -20,8 +20,8 @@ import ( "net/http" "strconv" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddytls" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddytls" "github.com/mholt/certmagic" ) diff --git a/caddyhttp/httpserver/https_test.go b/caddyhttp/httpserver/https_test.go index d5651998..7d3dcd1e 100644 --- a/caddyhttp/httpserver/https_test.go +++ b/caddyhttp/httpserver/https_test.go @@ -23,7 +23,7 @@ import ( "strconv" "testing" - "github.com/mholt/caddy/caddytls" + "github.com/caddyserver/caddy/caddytls" "github.com/mholt/certmagic" ) diff --git a/caddyhttp/httpserver/logger.go b/caddyhttp/httpserver/logger.go index cd2c2667..8db33107 100644 --- a/caddyhttp/httpserver/logger.go +++ b/caddyhttp/httpserver/logger.go @@ -24,7 +24,7 @@ import ( "sync" gsyslog "github.com/hashicorp/go-syslog" - "github.com/mholt/caddy" + "github.com/caddyserver/caddy" ) var remoteSyslogPrefixes = map[string]string{ diff --git a/caddyhttp/httpserver/middleware.go b/caddyhttp/httpserver/middleware.go index dbb44380..dfca16b1 100644 --- a/caddyhttp/httpserver/middleware.go +++ b/caddyhttp/httpserver/middleware.go @@ -21,7 +21,7 @@ import ( "path" "time" - "github.com/mholt/caddy" + "github.com/caddyserver/caddy" ) func init() { diff --git a/caddyhttp/httpserver/mitm.go b/caddyhttp/httpserver/mitm.go index 6736610e..5143e2d7 100644 --- a/caddyhttp/httpserver/mitm.go +++ b/caddyhttp/httpserver/mitm.go @@ -25,8 +25,8 @@ import ( "strings" "sync" - "github.com/mholt/caddy/caddytls" - "github.com/mholt/caddy/telemetry" + "github.com/caddyserver/caddy/caddytls" + "github.com/caddyserver/caddy/telemetry" ) // tlsHandler is a http.Handler that will inject a value diff --git a/caddyhttp/httpserver/plugin.go b/caddyhttp/httpserver/plugin.go index c919f472..606c71b0 100644 --- a/caddyhttp/httpserver/plugin.go +++ b/caddyhttp/httpserver/plugin.go @@ -27,11 +27,11 @@ import ( "strings" "time" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyfile" - "github.com/mholt/caddy/caddyhttp/staticfiles" - "github.com/mholt/caddy/caddytls" - "github.com/mholt/caddy/telemetry" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyfile" + "github.com/caddyserver/caddy/caddyhttp/staticfiles" + "github.com/caddyserver/caddy/caddytls" + "github.com/caddyserver/caddy/telemetry" "github.com/mholt/certmagic" ) diff --git a/caddyhttp/httpserver/plugin_test.go b/caddyhttp/httpserver/plugin_test.go index bf922dfc..702ef00f 100644 --- a/caddyhttp/httpserver/plugin_test.go +++ b/caddyhttp/httpserver/plugin_test.go @@ -22,8 +22,8 @@ import ( "fmt" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyfile" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyfile" ) func TestStandardizeAddress(t *testing.T) { diff --git a/caddyhttp/httpserver/replacer.go b/caddyhttp/httpserver/replacer.go index bf5240d9..e11824d3 100644 --- a/caddyhttp/httpserver/replacer.go +++ b/caddyhttp/httpserver/replacer.go @@ -32,8 +32,8 @@ import ( "strings" "time" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddytls" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddytls" ) // requestReplacer is a strings.Replacer which is used to diff --git a/caddyhttp/httpserver/replacer_test.go b/caddyhttp/httpserver/replacer_test.go index 6b696601..289c4c96 100644 --- a/caddyhttp/httpserver/replacer_test.go +++ b/caddyhttp/httpserver/replacer_test.go @@ -30,7 +30,7 @@ import ( "testing" "time" - "github.com/mholt/caddy/caddytls" + "github.com/caddyserver/caddy/caddytls" ) func TestNewReplacer(t *testing.T) { diff --git a/caddyhttp/httpserver/server.go b/caddyhttp/httpserver/server.go index 7940ac83..5368407b 100644 --- a/caddyhttp/httpserver/server.go +++ b/caddyhttp/httpserver/server.go @@ -32,10 +32,10 @@ import ( "time" "github.com/lucas-clemente/quic-go/h2quic" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/staticfiles" - "github.com/mholt/caddy/caddytls" - "github.com/mholt/caddy/telemetry" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/staticfiles" + "github.com/caddyserver/caddy/caddytls" + "github.com/caddyserver/caddy/telemetry" ) // Server is the HTTP server implementation. diff --git a/caddyhttp/httpserver/siteconfig.go b/caddyhttp/httpserver/siteconfig.go index 069a4a10..f94707ee 100644 --- a/caddyhttp/httpserver/siteconfig.go +++ b/caddyhttp/httpserver/siteconfig.go @@ -17,7 +17,7 @@ package httpserver import ( "time" - "github.com/mholt/caddy/caddytls" + "github.com/caddyserver/caddy/caddytls" ) // SiteConfig contains information about a site diff --git a/caddyhttp/httpserver/tplcontext.go b/caddyhttp/httpserver/tplcontext.go index 0ef93d35..5688679c 100644 --- a/caddyhttp/httpserver/tplcontext.go +++ b/caddyhttp/httpserver/tplcontext.go @@ -33,7 +33,7 @@ import ( "os" - "github.com/mholt/caddy/caddytls" + "github.com/caddyserver/caddy/caddytls" "github.com/mholt/certmagic" "github.com/russross/blackfriday" ) diff --git a/caddyhttp/index/index.go b/caddyhttp/index/index.go index fefc0ff7..f3a21fca 100644 --- a/caddyhttp/index/index.go +++ b/caddyhttp/index/index.go @@ -15,8 +15,8 @@ package index import ( - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func init() { diff --git a/caddyhttp/index/index_test.go b/caddyhttp/index/index_test.go index f0b3f41d..6da56f7b 100644 --- a/caddyhttp/index/index_test.go +++ b/caddyhttp/index/index_test.go @@ -17,9 +17,9 @@ package index import ( "testing" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" - "github.com/mholt/caddy/caddyhttp/staticfiles" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/staticfiles" ) func TestIndexIncompleteParams(t *testing.T) { diff --git a/caddyhttp/internalsrv/internal.go b/caddyhttp/internalsrv/internal.go index 3bd47956..92ad4ab4 100644 --- a/caddyhttp/internalsrv/internal.go +++ b/caddyhttp/internalsrv/internal.go @@ -23,7 +23,7 @@ package internalsrv import ( "net/http" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) // Internal middleware protects internal locations from external requests - diff --git a/caddyhttp/internalsrv/internal_test.go b/caddyhttp/internalsrv/internal_test.go index c6f5b56e..eba6070e 100644 --- a/caddyhttp/internalsrv/internal_test.go +++ b/caddyhttp/internalsrv/internal_test.go @@ -23,7 +23,7 @@ import ( "strconv" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) const ( diff --git a/caddyhttp/internalsrv/setup.go b/caddyhttp/internalsrv/setup.go index f70147ac..c5470556 100644 --- a/caddyhttp/internalsrv/setup.go +++ b/caddyhttp/internalsrv/setup.go @@ -15,8 +15,8 @@ package internalsrv import ( - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func init() { diff --git a/caddyhttp/internalsrv/setup_test.go b/caddyhttp/internalsrv/setup_test.go index 44928ef1..6df395e5 100644 --- a/caddyhttp/internalsrv/setup_test.go +++ b/caddyhttp/internalsrv/setup_test.go @@ -17,8 +17,8 @@ package internalsrv import ( "testing" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestSetup(t *testing.T) { diff --git a/caddyhttp/limits/handler.go b/caddyhttp/limits/handler.go index ded2fabe..5adb5847 100644 --- a/caddyhttp/limits/handler.go +++ b/caddyhttp/limits/handler.go @@ -18,7 +18,7 @@ import ( "io" "net/http" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) // Limit is a middleware to control request body size diff --git a/caddyhttp/limits/handler_test.go b/caddyhttp/limits/handler_test.go index 947a3266..b7fd175b 100644 --- a/caddyhttp/limits/handler_test.go +++ b/caddyhttp/limits/handler_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestBodySizeLimit(t *testing.T) { diff --git a/caddyhttp/limits/setup.go b/caddyhttp/limits/setup.go index e9971263..f96e5676 100644 --- a/caddyhttp/limits/setup.go +++ b/caddyhttp/limits/setup.go @@ -20,8 +20,8 @@ import ( "strconv" "strings" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) const ( diff --git a/caddyhttp/limits/setup_test.go b/caddyhttp/limits/setup_test.go index f9613602..515f3281 100644 --- a/caddyhttp/limits/setup_test.go +++ b/caddyhttp/limits/setup_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) const ( diff --git a/caddyhttp/log/log.go b/caddyhttp/log/log.go index 251f091c..2289e350 100644 --- a/caddyhttp/log/log.go +++ b/caddyhttp/log/log.go @@ -20,8 +20,8 @@ import ( "net" "net/http" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func init() { diff --git a/caddyhttp/log/log_test.go b/caddyhttp/log/log_test.go index 3e0bdcdf..c67316ce 100644 --- a/caddyhttp/log/log_test.go +++ b/caddyhttp/log/log_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) type erroringMiddleware struct{} diff --git a/caddyhttp/log/setup.go b/caddyhttp/log/setup.go index 0c889a9f..35822d12 100644 --- a/caddyhttp/log/setup.go +++ b/caddyhttp/log/setup.go @@ -18,8 +18,8 @@ import ( "net" "strings" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) // setup sets up the logging middleware. diff --git a/caddyhttp/log/setup_test.go b/caddyhttp/log/setup_test.go index ede552b7..af710c9b 100644 --- a/caddyhttp/log/setup_test.go +++ b/caddyhttp/log/setup_test.go @@ -19,8 +19,8 @@ import ( "reflect" "testing" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestSetup(t *testing.T) { diff --git a/caddyhttp/markdown/markdown.go b/caddyhttp/markdown/markdown.go index 1bbb36b4..4f688efd 100644 --- a/caddyhttp/markdown/markdown.go +++ b/caddyhttp/markdown/markdown.go @@ -26,7 +26,7 @@ import ( "text/template" "time" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" "github.com/russross/blackfriday" ) diff --git a/caddyhttp/markdown/markdown_test.go b/caddyhttp/markdown/markdown_test.go index 77ba2874..87a5a164 100644 --- a/caddyhttp/markdown/markdown_test.go +++ b/caddyhttp/markdown/markdown_test.go @@ -23,8 +23,8 @@ import ( "testing" "text/template" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" "github.com/russross/blackfriday" ) diff --git a/caddyhttp/markdown/process.go b/caddyhttp/markdown/process.go index e0594d99..7880a4c6 100644 --- a/caddyhttp/markdown/process.go +++ b/caddyhttp/markdown/process.go @@ -19,9 +19,9 @@ import ( "io/ioutil" "os" - "github.com/mholt/caddy/caddyhttp/httpserver" - "github.com/mholt/caddy/caddyhttp/markdown/metadata" - "github.com/mholt/caddy/caddyhttp/markdown/summary" + "github.com/caddyserver/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/markdown/metadata" + "github.com/caddyserver/caddy/caddyhttp/markdown/summary" "github.com/russross/blackfriday" ) diff --git a/caddyhttp/markdown/process_test.go b/caddyhttp/markdown/process_test.go index 5f8ef08d..0a99edd4 100644 --- a/caddyhttp/markdown/process_test.go +++ b/caddyhttp/markdown/process_test.go @@ -19,7 +19,7 @@ import ( "strings" "testing" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestConfig_Markdown(t *testing.T) { diff --git a/caddyhttp/markdown/setup.go b/caddyhttp/markdown/setup.go index 45ca7133..deda2018 100644 --- a/caddyhttp/markdown/setup.go +++ b/caddyhttp/markdown/setup.go @@ -18,8 +18,8 @@ import ( "net/http" "path/filepath" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" "github.com/russross/blackfriday" ) diff --git a/caddyhttp/markdown/setup_test.go b/caddyhttp/markdown/setup_test.go index 0f58f566..87f3f417 100644 --- a/caddyhttp/markdown/setup_test.go +++ b/caddyhttp/markdown/setup_test.go @@ -22,8 +22,8 @@ import ( "testing" "text/template" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestSetup(t *testing.T) { diff --git a/caddyhttp/markdown/template.go b/caddyhttp/markdown/template.go index ff8ad9b9..124e0cf3 100644 --- a/caddyhttp/markdown/template.go +++ b/caddyhttp/markdown/template.go @@ -21,8 +21,8 @@ import ( "sync" "text/template" - "github.com/mholt/caddy/caddyhttp/httpserver" - "github.com/mholt/caddy/caddyhttp/markdown/metadata" + "github.com/caddyserver/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/markdown/metadata" ) // Data represents a markdown document. diff --git a/caddyhttp/mime/mime.go b/caddyhttp/mime/mime.go index 740a0ab0..2edbdc51 100644 --- a/caddyhttp/mime/mime.go +++ b/caddyhttp/mime/mime.go @@ -18,7 +18,7 @@ import ( "net/http" "path" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) // Config represent a mime config. Map from extension to mime-type. diff --git a/caddyhttp/mime/mime_test.go b/caddyhttp/mime/mime_test.go index e7c7b719..8c73290d 100644 --- a/caddyhttp/mime/mime_test.go +++ b/caddyhttp/mime/mime_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestMimeHandler(t *testing.T) { diff --git a/caddyhttp/mime/setup.go b/caddyhttp/mime/setup.go index 7c9aee5f..1b108c0a 100644 --- a/caddyhttp/mime/setup.go +++ b/caddyhttp/mime/setup.go @@ -18,8 +18,8 @@ import ( "fmt" "strings" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func init() { diff --git a/caddyhttp/mime/setup_test.go b/caddyhttp/mime/setup_test.go index c09c8f85..60aa3489 100644 --- a/caddyhttp/mime/setup_test.go +++ b/caddyhttp/mime/setup_test.go @@ -17,8 +17,8 @@ package mime import ( "testing" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestSetup(t *testing.T) { diff --git a/caddyhttp/pprof/pprof.go b/caddyhttp/pprof/pprof.go index 36938bae..fe676ca5 100644 --- a/caddyhttp/pprof/pprof.go +++ b/caddyhttp/pprof/pprof.go @@ -18,7 +18,7 @@ import ( "net/http" pp "net/http/pprof" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) // BasePath is the base path to match for all pprof requests. diff --git a/caddyhttp/pprof/pprof_test.go b/caddyhttp/pprof/pprof_test.go index 873f0d57..b88c6081 100644 --- a/caddyhttp/pprof/pprof_test.go +++ b/caddyhttp/pprof/pprof_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestServeHTTP(t *testing.T) { diff --git a/caddyhttp/pprof/setup.go b/caddyhttp/pprof/setup.go index c829020e..8ec9b564 100644 --- a/caddyhttp/pprof/setup.go +++ b/caddyhttp/pprof/setup.go @@ -15,8 +15,8 @@ package pprof import ( - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func init() { diff --git a/caddyhttp/pprof/setup_test.go b/caddyhttp/pprof/setup_test.go index 7d1d8d41..76e18082 100644 --- a/caddyhttp/pprof/setup_test.go +++ b/caddyhttp/pprof/setup_test.go @@ -17,7 +17,7 @@ package pprof import ( "testing" - "github.com/mholt/caddy" + "github.com/caddyserver/caddy" ) func TestSetup(t *testing.T) { diff --git a/caddyhttp/proxy/proxy.go b/caddyhttp/proxy/proxy.go index fe10ea61..2cc04c7a 100644 --- a/caddyhttp/proxy/proxy.go +++ b/caddyhttp/proxy/proxy.go @@ -25,7 +25,7 @@ import ( "sync/atomic" "time" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) // Proxy represents a middleware instance that can proxy requests. diff --git a/caddyhttp/proxy/proxy_test.go b/caddyhttp/proxy/proxy_test.go index 7126b111..47da4b83 100644 --- a/caddyhttp/proxy/proxy_test.go +++ b/caddyhttp/proxy/proxy_test.go @@ -40,8 +40,8 @@ import ( "time" "github.com/lucas-clemente/quic-go/h2quic" - "github.com/mholt/caddy/caddyfile" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyfile" + "github.com/caddyserver/caddy/caddyhttp/httpserver" "golang.org/x/net/websocket" ) diff --git a/caddyhttp/proxy/reverseproxy.go b/caddyhttp/proxy/reverseproxy.go index c20be0c1..a223d353 100644 --- a/caddyhttp/proxy/reverseproxy.go +++ b/caddyhttp/proxy/reverseproxy.go @@ -43,7 +43,7 @@ import ( "github.com/lucas-clemente/quic-go" "github.com/lucas-clemente/quic-go/h2quic" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) var ( @@ -515,7 +515,7 @@ func (rp *ReverseProxy) copyResponse(dst io.Writer, src io.Reader) { } // skip these headers if they already exist. -// see https://github.com/mholt/caddy/pull/1112#discussion_r80092582 +// see https://github.com/caddyserver/caddy/pull/1112#discussion_r80092582 var skipHeaders = map[string]struct{}{ "Content-Type": {}, "Content-Disposition": {}, @@ -529,7 +529,7 @@ func copyHeader(dst, src http.Header) { for k, vv := range src { if _, ok := dst[k]; ok { // skip some predefined headers - // see https://github.com/mholt/caddy/issues/1086 + // see https://github.com/caddyserver/caddy/issues/1086 if _, shouldSkip := skipHeaders[k]; shouldSkip { continue } diff --git a/caddyhttp/proxy/setup.go b/caddyhttp/proxy/setup.go index 8db25b66..142bb242 100644 --- a/caddyhttp/proxy/setup.go +++ b/caddyhttp/proxy/setup.go @@ -15,8 +15,8 @@ package proxy import ( - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func init() { diff --git a/caddyhttp/proxy/setup_test.go b/caddyhttp/proxy/setup_test.go index 3b579557..53d7a511 100644 --- a/caddyhttp/proxy/setup_test.go +++ b/caddyhttp/proxy/setup_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestSetup(t *testing.T) { diff --git a/caddyhttp/proxy/upstream.go b/caddyhttp/proxy/upstream.go index 882a0aeb..8c186dcb 100644 --- a/caddyhttp/proxy/upstream.go +++ b/caddyhttp/proxy/upstream.go @@ -36,8 +36,8 @@ import ( "crypto/tls" - "github.com/mholt/caddy/caddyfile" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyfile" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) var ( @@ -645,7 +645,7 @@ func (u *staticUpstream) healthCheck() { return false } // TODO ReadAll will be replaced if deemed necessary - // See https://github.com/mholt/caddy/pull/1691 + // See https://github.com/caddyserver/caddy/pull/1691 buf, err := ioutil.ReadAll(r.Body) if err != nil { return true diff --git a/caddyhttp/proxy/upstream_test.go b/caddyhttp/proxy/upstream_test.go index 0e714892..df2ed245 100644 --- a/caddyhttp/proxy/upstream_test.go +++ b/caddyhttp/proxy/upstream_test.go @@ -31,7 +31,7 @@ import ( "time" "github.com/lucas-clemente/quic-go/h2quic" - "github.com/mholt/caddy/caddyfile" + "github.com/caddyserver/caddy/caddyfile" ) func TestNewHost(t *testing.T) { diff --git a/caddyhttp/push/handler.go b/caddyhttp/push/handler.go index 4a676c27..557a2710 100644 --- a/caddyhttp/push/handler.go +++ b/caddyhttp/push/handler.go @@ -18,7 +18,7 @@ import ( "net/http" "strings" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func (h Middleware) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error) { diff --git a/caddyhttp/push/handler_test.go b/caddyhttp/push/handler_test.go index 4b837e30..79cf2081 100644 --- a/caddyhttp/push/handler_test.go +++ b/caddyhttp/push/handler_test.go @@ -25,7 +25,7 @@ import ( "reflect" "testing" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) type MockedPusher struct { diff --git a/caddyhttp/push/push.go b/caddyhttp/push/push.go index 5dc75c11..acf0c4dc 100644 --- a/caddyhttp/push/push.go +++ b/caddyhttp/push/push.go @@ -17,7 +17,7 @@ package push import ( "net/http" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) type ( diff --git a/caddyhttp/push/setup.go b/caddyhttp/push/setup.go index a5037df3..279e4df1 100644 --- a/caddyhttp/push/setup.go +++ b/caddyhttp/push/setup.go @@ -20,8 +20,8 @@ import ( "net/http" "strings" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func init() { diff --git a/caddyhttp/push/setup_test.go b/caddyhttp/push/setup_test.go index 99a93932..55693bdf 100644 --- a/caddyhttp/push/setup_test.go +++ b/caddyhttp/push/setup_test.go @@ -19,8 +19,8 @@ import ( "reflect" "testing" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestPushAvailable(t *testing.T) { diff --git a/caddyhttp/redirect/redirect.go b/caddyhttp/redirect/redirect.go index 9ae102fe..c25c9742 100644 --- a/caddyhttp/redirect/redirect.go +++ b/caddyhttp/redirect/redirect.go @@ -21,7 +21,7 @@ import ( "html" "net/http" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) // Redirect is middleware to respond with HTTP redirects diff --git a/caddyhttp/redirect/redirect_test.go b/caddyhttp/redirect/redirect_test.go index 4c047dd4..2d020be6 100644 --- a/caddyhttp/redirect/redirect_test.go +++ b/caddyhttp/redirect/redirect_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestRedirect(t *testing.T) { diff --git a/caddyhttp/redirect/setup.go b/caddyhttp/redirect/setup.go index 7813fe24..89160ee2 100644 --- a/caddyhttp/redirect/setup.go +++ b/caddyhttp/redirect/setup.go @@ -17,8 +17,8 @@ package redirect import ( "net/http" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func init() { diff --git a/caddyhttp/redirect/setup_test.go b/caddyhttp/redirect/setup_test.go index 5f218b49..ca0fe9c0 100644 --- a/caddyhttp/redirect/setup_test.go +++ b/caddyhttp/redirect/setup_test.go @@ -18,8 +18,8 @@ import ( "fmt" "testing" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestSetup(t *testing.T) { diff --git a/caddyhttp/requestid/requestid.go b/caddyhttp/requestid/requestid.go index b03c449f..83d76d7a 100644 --- a/caddyhttp/requestid/requestid.go +++ b/caddyhttp/requestid/requestid.go @@ -20,7 +20,7 @@ import ( "net/http" "github.com/google/uuid" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) // Handler is a middleware handler diff --git a/caddyhttp/requestid/requestid_test.go b/caddyhttp/requestid/requestid_test.go index b777c9d7..41da43f2 100644 --- a/caddyhttp/requestid/requestid_test.go +++ b/caddyhttp/requestid/requestid_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestRequestIDHandler(t *testing.T) { diff --git a/caddyhttp/requestid/setup.go b/caddyhttp/requestid/setup.go index 689f99e3..97752888 100644 --- a/caddyhttp/requestid/setup.go +++ b/caddyhttp/requestid/setup.go @@ -15,8 +15,8 @@ package requestid import ( - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func init() { diff --git a/caddyhttp/requestid/setup_test.go b/caddyhttp/requestid/setup_test.go index 9c420787..5e8c841e 100644 --- a/caddyhttp/requestid/setup_test.go +++ b/caddyhttp/requestid/setup_test.go @@ -17,8 +17,8 @@ package requestid import ( "testing" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestSetup(t *testing.T) { diff --git a/caddyhttp/rewrite/rewrite.go b/caddyhttp/rewrite/rewrite.go index 634b7555..42116840 100644 --- a/caddyhttp/rewrite/rewrite.go +++ b/caddyhttp/rewrite/rewrite.go @@ -25,7 +25,7 @@ import ( "regexp" "strings" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) // Result is the result of a rewrite diff --git a/caddyhttp/rewrite/rewrite_test.go b/caddyhttp/rewrite/rewrite_test.go index b20d91ef..9a99a39c 100644 --- a/caddyhttp/rewrite/rewrite_test.go +++ b/caddyhttp/rewrite/rewrite_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestRewrite(t *testing.T) { diff --git a/caddyhttp/rewrite/setup.go b/caddyhttp/rewrite/setup.go index f73d76a7..549825f2 100644 --- a/caddyhttp/rewrite/setup.go +++ b/caddyhttp/rewrite/setup.go @@ -18,8 +18,8 @@ import ( "net/http" "strings" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func init() { diff --git a/caddyhttp/rewrite/setup_test.go b/caddyhttp/rewrite/setup_test.go index e192242d..b0eaf073 100644 --- a/caddyhttp/rewrite/setup_test.go +++ b/caddyhttp/rewrite/setup_test.go @@ -20,8 +20,8 @@ import ( "strings" "testing" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestSetup(t *testing.T) { diff --git a/caddyhttp/rewrite/to.go b/caddyhttp/rewrite/to.go index 1b0856f7..e086a4c0 100644 --- a/caddyhttp/rewrite/to.go +++ b/caddyhttp/rewrite/to.go @@ -21,7 +21,7 @@ import ( "path" "strings" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) // To attempts rewrite. It attempts to rewrite to first valid path diff --git a/caddyhttp/rewrite/to_test.go b/caddyhttp/rewrite/to_test.go index 5d3ac1c7..358760ed 100644 --- a/caddyhttp/rewrite/to_test.go +++ b/caddyhttp/rewrite/to_test.go @@ -20,7 +20,7 @@ import ( "net/url" "testing" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestTo(t *testing.T) { diff --git a/caddyhttp/root/root.go b/caddyhttp/root/root.go index 47df53db..3eb476e6 100644 --- a/caddyhttp/root/root.go +++ b/caddyhttp/root/root.go @@ -18,8 +18,8 @@ import ( "log" "os" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func init() { diff --git a/caddyhttp/root/root_test.go b/caddyhttp/root/root_test.go index fcfb1bb0..e61c5e29 100644 --- a/caddyhttp/root/root_test.go +++ b/caddyhttp/root/root_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestRoot(t *testing.T) { diff --git a/caddyhttp/staticfiles/fileserver.go b/caddyhttp/staticfiles/fileserver.go index 0863ebe5..27349855 100644 --- a/caddyhttp/staticfiles/fileserver.go +++ b/caddyhttp/staticfiles/fileserver.go @@ -28,7 +28,7 @@ import ( "strconv" "strings" - "github.com/mholt/caddy" + "github.com/caddyserver/caddy" ) // FileServer implements a production-ready file server diff --git a/caddyhttp/staticfiles/fileserver_test.go b/caddyhttp/staticfiles/fileserver_test.go index 200b6d6e..3eb10e3a 100644 --- a/caddyhttp/staticfiles/fileserver_test.go +++ b/caddyhttp/staticfiles/fileserver_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/mholt/caddy" + "github.com/caddyserver/caddy" ) // TestServeHTTP covers positive scenarios when serving files. diff --git a/caddyhttp/status/setup.go b/caddyhttp/status/setup.go index 5c294314..b257a196 100644 --- a/caddyhttp/status/setup.go +++ b/caddyhttp/status/setup.go @@ -17,8 +17,8 @@ package status import ( "strconv" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) // init registers Status plugin diff --git a/caddyhttp/status/setup_test.go b/caddyhttp/status/setup_test.go index 09c8189c..385ec08d 100644 --- a/caddyhttp/status/setup_test.go +++ b/caddyhttp/status/setup_test.go @@ -17,8 +17,8 @@ package status import ( "testing" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestSetup(t *testing.T) { diff --git a/caddyhttp/status/status.go b/caddyhttp/status/status.go index a00366e6..323a76b2 100644 --- a/caddyhttp/status/status.go +++ b/caddyhttp/status/status.go @@ -18,7 +18,7 @@ package status import ( "net/http" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) // Rule describes status rewriting rule diff --git a/caddyhttp/status/status_test.go b/caddyhttp/status/status_test.go index 2283df3b..166c8d74 100644 --- a/caddyhttp/status/status_test.go +++ b/caddyhttp/status/status_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestStatus(t *testing.T) { diff --git a/caddyhttp/templates/setup.go b/caddyhttp/templates/setup.go index e9fe105f..a8e3d993 100644 --- a/caddyhttp/templates/setup.go +++ b/caddyhttp/templates/setup.go @@ -19,8 +19,8 @@ import ( "net/http" "sync" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func init() { diff --git a/caddyhttp/templates/setup_test.go b/caddyhttp/templates/setup_test.go index 1d6dd524..7a224a49 100644 --- a/caddyhttp/templates/setup_test.go +++ b/caddyhttp/templates/setup_test.go @@ -18,8 +18,8 @@ import ( "fmt" "testing" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestSetup(t *testing.T) { diff --git a/caddyhttp/templates/templates.go b/caddyhttp/templates/templates.go index 9a1ae4ba..01df9079 100644 --- a/caddyhttp/templates/templates.go +++ b/caddyhttp/templates/templates.go @@ -28,7 +28,7 @@ import ( "text/template" "time" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) // ServeHTTP implements the httpserver.Handler interface. diff --git a/caddyhttp/templates/templates_test.go b/caddyhttp/templates/templates_test.go index 6a175f1b..3301ebb2 100644 --- a/caddyhttp/templates/templates_test.go +++ b/caddyhttp/templates/templates_test.go @@ -23,8 +23,8 @@ import ( "sync" "testing" - "github.com/mholt/caddy/caddyhttp/httpserver" - "github.com/mholt/caddy/caddyhttp/staticfiles" + "github.com/caddyserver/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/staticfiles" ) func TestTemplates(t *testing.T) { diff --git a/caddyhttp/timeouts/timeouts.go b/caddyhttp/timeouts/timeouts.go index 749c03b0..f29152dc 100644 --- a/caddyhttp/timeouts/timeouts.go +++ b/caddyhttp/timeouts/timeouts.go @@ -17,8 +17,8 @@ package timeouts import ( "time" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func init() { diff --git a/caddyhttp/timeouts/timeouts_test.go b/caddyhttp/timeouts/timeouts_test.go index 758e4b97..cb5f6f7a 100644 --- a/caddyhttp/timeouts/timeouts_test.go +++ b/caddyhttp/timeouts/timeouts_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestSetupTimeouts(t *testing.T) { diff --git a/caddyhttp/websocket/setup.go b/caddyhttp/websocket/setup.go index 822ccd15..bebd9b5b 100644 --- a/caddyhttp/websocket/setup.go +++ b/caddyhttp/websocket/setup.go @@ -15,8 +15,8 @@ package websocket import ( - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func init() { diff --git a/caddyhttp/websocket/setup_test.go b/caddyhttp/websocket/setup_test.go index 368ffe70..4cc93560 100644 --- a/caddyhttp/websocket/setup_test.go +++ b/caddyhttp/websocket/setup_test.go @@ -17,8 +17,8 @@ package websocket import ( "testing" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) func TestWebSocket(t *testing.T) { diff --git a/caddyhttp/websocket/websocket.go b/caddyhttp/websocket/websocket.go index a1f659bf..69b10ca7 100644 --- a/caddyhttp/websocket/websocket.go +++ b/caddyhttp/websocket/websocket.go @@ -30,7 +30,7 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) const ( diff --git a/caddytls/config.go b/caddytls/config.go index 7e8b107f..817fb0da 100644 --- a/caddytls/config.go +++ b/caddytls/config.go @@ -25,7 +25,7 @@ import ( "github.com/go-acme/lego/certcrypto" "github.com/klauspost/cpuid" - "github.com/mholt/caddy" + "github.com/caddyserver/caddy" "github.com/mholt/certmagic" ) @@ -315,7 +315,7 @@ func MakeTLSConfig(configs []*Config) (*tls.Config, error) { // A tls.Config must have Certificates or GetCertificate // set, in order to be accepted by tls.Listen and quic.Listen. // TODO: remove this once the standard library allows a tls.Config with - // only GetConfigForClient set. https://github.com/mholt/caddy/pull/2404 + // only GetConfigForClient set. https://github.com/caddyserver/caddy/pull/2404 GetCertificate: func(*tls.ClientHelloInfo) (*tls.Certificate, error) { return nil, fmt.Errorf("all certificates configured via GetConfigForClient") }, @@ -512,7 +512,7 @@ var defaultCiphersNonAESNI = []uint16{ // getPreferredDefaultCiphers returns an appropriate cipher suite to use, depending on // the hardware support available for AES-NI. // -// See https://github.com/mholt/caddy/issues/1674 +// See https://github.com/caddyserver/caddy/issues/1674 func getPreferredDefaultCiphers() []uint16 { if cpuid.CPU.AesNi() { return defaultCiphers diff --git a/caddytls/handshake.go b/caddytls/handshake.go index 5bed3ade..6640c7b0 100644 --- a/caddytls/handshake.go +++ b/caddytls/handshake.go @@ -21,7 +21,7 @@ import ( "net" "strings" - "github.com/mholt/caddy/telemetry" + "github.com/caddyserver/caddy/telemetry" "github.com/mholt/certmagic" ) diff --git a/caddytls/setup.go b/caddytls/setup.go index e8a62645..a1620d57 100644 --- a/caddytls/setup.go +++ b/caddytls/setup.go @@ -29,8 +29,8 @@ import ( "sync/atomic" "time" - "github.com/mholt/caddy" - "github.com/mholt/caddy/telemetry" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/telemetry" "github.com/mholt/certmagic" ) diff --git a/caddytls/setup_test.go b/caddytls/setup_test.go index b0c7b062..c7256b23 100644 --- a/caddytls/setup_test.go +++ b/caddytls/setup_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/go-acme/lego/certcrypto" - "github.com/mholt/caddy" + "github.com/caddyserver/caddy" "github.com/mholt/certmagic" ) diff --git a/caddytls/tls.go b/caddytls/tls.go index e419f6f4..6af87459 100644 --- a/caddytls/tls.go +++ b/caddytls/tls.go @@ -30,7 +30,7 @@ package caddytls import ( "github.com/go-acme/lego/challenge" - "github.com/mholt/caddy" + "github.com/caddyserver/caddy" "github.com/mholt/certmagic" ) diff --git a/controller.go b/controller.go index af40a23a..07f114f9 100644 --- a/controller.go +++ b/controller.go @@ -17,7 +17,7 @@ package caddy import ( "strings" - "github.com/mholt/caddy/caddyfile" + "github.com/caddyserver/caddy/caddyfile" ) // Controller is given to the setup function of directives which diff --git a/dist/LICENSES.txt b/dist/LICENSES.txt index 83c2ea97..11829031 100644 --- a/dist/LICENSES.txt +++ b/dist/LICENSES.txt @@ -5,7 +5,7 @@ as to be in full compliance with the licenses of all bundled property. ### -### github.com/mholt/caddy +### github.com/caddyserver/caddy ### Apache License diff --git a/dist/README.txt b/dist/README.txt index 9197c15a..15da2140 100644 --- a/dist/README.txt +++ b/dist/README.txt @@ -10,7 +10,7 @@ Twitter @caddyserver Source Code - https://github.com/mholt/caddy + https://github.com/caddyserver/caddy https://github.com/caddyserver @@ -27,7 +27,7 @@ and we'll review it! Your contributions will reach millions of people who connect to sites served by Caddy. Extend Caddy by developing a plugin for it! Instructions on -the project wiki: https://github.com/mholt/caddy/wiki +the project wiki: https://github.com/caddyserver/caddy/wiki And thanks - you're awesome! diff --git a/dist/init/linux-systemd/README.md b/dist/init/linux-systemd/README.md index 49cafc7b..1b85ebaf 100644 --- a/dist/init/linux-systemd/README.md +++ b/dist/init/linux-systemd/README.md @@ -91,7 +91,7 @@ Install the systemd service unit configuration file, reload the systemd daemon, and start caddy: ```bash -wget https://raw.githubusercontent.com/mholt/caddy/master/dist/init/linux-systemd/caddy.service +wget https://raw.githubusercontent.com/caddyserver/caddy/master/dist/init/linux-systemd/caddy.service sudo cp caddy.service /etc/systemd/system/ sudo chown root:root /etc/systemd/system/caddy.service sudo chmod 644 /etc/systemd/system/caddy.service diff --git a/go.mod b/go.mod index a5f4bdc4..987f8dcc 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/mholt/caddy +module github.com/caddyserver/caddy go 1.12 diff --git a/onevent/hook/config.go b/onevent/hook/config.go index 5055e7eb..51fb0ae4 100644 --- a/onevent/hook/config.go +++ b/onevent/hook/config.go @@ -1,7 +1,7 @@ package hook import ( - "github.com/mholt/caddy" + "github.com/caddyserver/caddy" ) // Config describes how Hook should be configured and used. diff --git a/onevent/hook/hook.go b/onevent/hook/hook.go index 9d2c4d0b..909d86bc 100644 --- a/onevent/hook/hook.go +++ b/onevent/hook/hook.go @@ -6,7 +6,7 @@ import ( "os/exec" "strings" - "github.com/mholt/caddy" + "github.com/caddyserver/caddy" ) // Hook executes a command. diff --git a/onevent/hook/hook_test.go b/onevent/hook/hook_test.go index a67abf0f..f3b3d67e 100644 --- a/onevent/hook/hook_test.go +++ b/onevent/hook/hook_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/google/uuid" - "github.com/mholt/caddy" + "github.com/caddyserver/caddy" ) func TestHook(t *testing.T) { diff --git a/onevent/on.go b/onevent/on.go index 473cba55..2ba99e8b 100644 --- a/onevent/on.go +++ b/onevent/on.go @@ -4,8 +4,8 @@ import ( "strings" "github.com/google/uuid" - "github.com/mholt/caddy" - "github.com/mholt/caddy/onevent/hook" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/onevent/hook" ) func init() { diff --git a/onevent/on_test.go b/onevent/on_test.go index 33e4490e..6ffa7af2 100644 --- a/onevent/on_test.go +++ b/onevent/on_test.go @@ -3,8 +3,8 @@ package onevent import ( "testing" - "github.com/mholt/caddy" - "github.com/mholt/caddy/onevent/hook" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/onevent/hook" ) func TestSetup(t *testing.T) { diff --git a/plugins.go b/plugins.go index cd4497fa..f5516e2f 100644 --- a/plugins.go +++ b/plugins.go @@ -21,7 +21,7 @@ import ( "sort" "sync" - "github.com/mholt/caddy/caddyfile" + "github.com/caddyserver/caddy/caddyfile" ) // These are all the registered plugins. diff --git a/sigtrap.go b/sigtrap.go index 4a8500c4..7570729d 100644 --- a/sigtrap.go +++ b/sigtrap.go @@ -20,7 +20,7 @@ import ( "os/signal" "sync" - "github.com/mholt/caddy/telemetry" + "github.com/caddyserver/caddy/telemetry" "github.com/mholt/certmagic" ) diff --git a/sigtrap_posix.go b/sigtrap_posix.go index 5355ba17..f19f05c1 100644 --- a/sigtrap_posix.go +++ b/sigtrap_posix.go @@ -22,7 +22,7 @@ import ( "os/signal" "syscall" - "github.com/mholt/caddy/telemetry" + "github.com/caddyserver/caddy/telemetry" "github.com/mholt/certmagic" )