Skip to content

Commit 7af135a

Browse files
committed
Doc update
1 parent 04b4aab commit 7af135a

2 files changed

Lines changed: 7 additions & 23 deletions

File tree

.golangci.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
# Linter, that we were forced to switch to, doesn't allow disabling
2-
# of linting of test files as a cli argument.
3-
# (It does have useless --tests flag to enable the already enabled
4-
# linting of tests, while --tests false is interpreted incorrectly)
5-
#
6-
# Just make a file config for it and hope that one day all software will burn
1+
# golangci linter currently requires a config file to
2+
# disable checking of the test files
73
run:
84
tests: false

README.md

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -147,23 +147,11 @@ Don't forget to add "http.forwardproxy" plugin.
147147

148148
#### Build from source
149149

150-
0. Install latest stable Golang
151-
1. Download caddy webserver and forwardproxy plugin:
152-
```bash
153-
go get -d -u -t github.com/caddyserver/forwardproxy/... github.com/mholt/caddy/...
154-
```
155-
2. Add 'import _ "github.com/caddyserver/forwardproxy/"' to caddy/main.go:
156-
```bash
157-
sed -i 's/^import/import _ "github\.com\/caddyserver\/forwardproxy"\nimport/' ${GOPATH:-~/go}/src/github.com/mholt/caddy/caddy/main.go
158-
```
159-
3. Build it:
160-
```bash
161-
cd ${GOPATH:-~/go}/src/github.com/mholt/caddy/caddy/
162-
go build
163-
```
164-
165-
If it won't build, try reinstalling Golang, removing $GOPATH, you know, the usual dance.
166-
If version of caddy in trunk does not work, you can try building latest [stable release](https://github.com/mholt/caddy/releases).
150+
0. Install latest Golang 1.12 or above and set export GO111MODULE=on
151+
1. ```bash
152+
go install github.com/caddyserver/forwardproxy/cmd/caddy
153+
```
154+
Built `caddy` binary will be stored in $GOPATH/bin.
167155

168156
## Client Configuration
169157

0 commit comments

Comments
 (0)