From 7af135a175260d5f739170a14bd84f68854c3fa6 Mon Sep 17 00:00:00 2001 From: Sergey Frolov Date: Wed, 1 May 2019 00:36:14 -0600 Subject: [PATCH] Doc update --- .golangci.yml | 8 ++------ README.md | 22 +++++----------------- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 0274c0d..92a538e 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,8 +1,4 @@ -# Linter, that we were forced to switch to, doesn't allow disabling -# of linting of test files as a cli argument. -# (It does have useless --tests flag to enable the already enabled -# linting of tests, while --tests false is interpreted incorrectly) -# -# Just make a file config for it and hope that one day all software will burn +# golangci linter currently requires a config file to +# disable checking of the test files run: tests: false diff --git a/README.md b/README.md index 4c40bec..bc063d6 100644 --- a/README.md +++ b/README.md @@ -147,23 +147,11 @@ Don't forget to add "http.forwardproxy" plugin. #### Build from source -0. Install latest stable Golang -1. Download caddy webserver and forwardproxy plugin: - ```bash - go get -d -u -t github.com/caddyserver/forwardproxy/... github.com/mholt/caddy/... - ``` -2. Add 'import _ "github.com/caddyserver/forwardproxy/"' to caddy/main.go: - ```bash - sed -i 's/^import/import _ "github\.com\/caddyserver\/forwardproxy"\nimport/' ${GOPATH:-~/go}/src/github.com/mholt/caddy/caddy/main.go - ``` -3. Build it: - ```bash - cd ${GOPATH:-~/go}/src/github.com/mholt/caddy/caddy/ - go build - ``` - -If it won't build, try reinstalling Golang, removing $GOPATH, you know, the usual dance. -If version of caddy in trunk does not work, you can try building latest [stable release](https://github.com/mholt/caddy/releases). +0. Install latest Golang 1.12 or above and set export GO111MODULE=on +1. ```bash + go install github.com/caddyserver/forwardproxy/cmd/caddy + ``` + Built `caddy` binary will be stored in $GOPATH/bin. ## Client Configuration