summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--README.md10
-rw-r--r--dist/CHANGES.txt10
-rw-r--r--dist/README.txt2
3 files changed, 14 insertions, 8 deletions
diff --git a/README.md b/README.md
index 1d322be6a..0acd13657 100644
--- a/README.md
+++ b/README.md
@@ -81,8 +81,7 @@ To build from source you need **[Git](https://git-scm.com/downloads)** and **[Go
<!-- TODO: This env variable will not be required starting with Go 1.13 -->
1. Set the transitional environment variable for Go modules: `export GO111MODULE=on`
-<!-- TODO: The specific version will not be required after the stable 1.0.0 release -->
-2. Run `go get github.com/mholt/caddy/[email protected]`
+2. Run `go get github.com/mholt/caddy/caddy`
Caddy will be installed to your `$GOPATH/bin` folder.
@@ -111,8 +110,9 @@ func main() {
caddymain.Run()
}
```
-3. `go mod init mycaddy` (the name doesn't really matter).
-4. `go install` will then create your binary at `$GOPATH/bin`, or `go build` will put it in the current directory.
+3. `go mod init caddy`
+4. Run `go get github.com/mholt/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:**
@@ -120,7 +120,7 @@ func main() {
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).
-You can make changes to the source code in this repo, since it is a Go module.
+You can make changes to the source code from that clone and checkout any commit or tag you wish to develop on.
When building from source, telemetry is enabled by default. You can disable it by changing `caddymain.EnableTelemetry = false` in run.go, or use the `-disabled-metrics` flag at runtime to disable only certain metrics.
diff --git a/dist/CHANGES.txt b/dist/CHANGES.txt
index 4fc31d7ae..c4f9c94d9 100644
--- a/dist/CHANGES.txt
+++ b/dist/CHANGES.txt
@@ -1,12 +1,18 @@
CHANGES
-1.0.0beta2 (April 20, 2019)
+1.0.0 (April 24, 2019)
+- Minor internal/linting improvements
+- EULA no longer applies
+- Backwards compatibility goal (see project repo)
+
+
+1.0.0-beta2 (April 20, 2019)
- Continue migration to Go modules
- Eliminate need for special build script
- Internal changes for better compatibility
-1.0.0beta1 (April 9, 2019)
+1.0.0-beta1 (April 9, 2019)
- Major internal changes (Go modules & remove vendor)
- Rename -env flag to -envfile
- New -env flag to print the environment
diff --git a/dist/README.txt b/dist/README.txt
index c9db7a5da..9197c15aa 100644
--- a/dist/README.txt
+++ b/dist/README.txt
@@ -1,4 +1,4 @@
-CADDY 1.0.0beta2
+CADDY 1.0.0
Website
https://caddyserver.com