From b54fa4123975195c721ff5a5c0b43c4622009676 Mon Sep 17 00:00:00 2001
From: Matthew Holt <mholt@users.noreply.github.com>
Date: Wed, 24 Feb 2021 11:55:56 -0700
Subject: [PATCH] Update docs; commit setcap.sh

---
 .gitignore          |  1 -
 README.md           | 12 ++----------
 caddy.go            |  2 +-
 cmd/caddy/setcap.sh |  6 ++++++
 4 files changed, 9 insertions(+), 12 deletions(-)
 create mode 100755 cmd/caddy/setcap.sh

diff --git a/.gitignore b/.gitignore
index 250a40ad3..2d6336486 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@ Caddyfile
 # build artifacts and helpers
 cmd/caddy/caddy
 cmd/caddy/caddy.exe
-cmd/caddy/setcap*
 
 # mac specific
 .DS_Store
diff --git a/README.md b/README.md
index 620573eb9..b32be8973 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@
 
 The simplest, cross-platform way is to download from [GitHub Releases](https://github.com/caddyserver/caddy/releases) and place the executable file in your PATH.
 
-For other install options, see https://caddyserver.com/docs/download.
+For other install options, see https://caddyserver.com/docs/install.
 
 ## Build from source
 
@@ -89,15 +89,7 @@ $ go build
 
 When you run Caddy, it may try to bind to low ports unless otherwise specified in your config. If your OS requires elevated privileges for this, you will need to give your new binary permission to do so. On Linux, this can be done easily with: `sudo setcap cap_net_bind_service=+ep ./caddy`
 
-If you prefer to use `go run` which creates temporary binaries, you can still do this. Make an executable file called `setcap.sh` (or whatever you want) with these contents:
-
-```bash
-#!/bin/sh
-sudo setcap cap_net_bind_service=+ep "$1"
-"$@"
-```
-
-then you can use `go run` like so:
+If you prefer to use `go run` which only creates temporary binaries, you can still do this with the included `setcap.sh` like so:
 
 ```bash
 $ go run -exec ./setcap.sh main.go
diff --git a/caddy.go b/caddy.go
index a56529c4b..fccfeef9a 100644
--- a/caddy.go
+++ b/caddy.go
@@ -289,7 +289,7 @@ func unsyncedDecodeAndRun(cfgJSON []byte, allowPersist bool) error {
 		} else {
 			err := ioutil.WriteFile(ConfigAutosavePath, cfgJSON, 0600)
 			if err == nil {
-				Log().Info("autosaved config", zap.String("file", ConfigAutosavePath))
+				Log().Info("autosaved config (load with --resume flag)", zap.String("file", ConfigAutosavePath))
 			} else {
 				Log().Error("unable to autosave config",
 					zap.String("file", ConfigAutosavePath),
diff --git a/cmd/caddy/setcap.sh b/cmd/caddy/setcap.sh
new file mode 100755
index 000000000..d777e5a62
--- /dev/null
+++ b/cmd/caddy/setcap.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# USAGE: go run -exec ./setcap.sh <args...>
+
+sudo setcap cap_net_bind_service=+ep "$1"
+"$@"