summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMatthew Holt <[email protected]>2015-05-06 14:49:24 -0600
committerMatthew Holt <[email protected]>2015-05-06 14:49:24 -0600
commite12428efb9654a39078a49a6d67f9e4f85e96c69 (patch)
tree14767d1856531e3d38c8a13a7d5694ac8ea760fc
parent7c844909b98dc441726160c5e6b505a646e8fd5d (diff)
downloadcaddy-e12428efb9654a39078a49a6d67f9e4f85e96c69.tar.gz
caddy-e12428efb9654a39078a49a6d67f9e4f85e96c69.zip
Add build status
-rw-r--r--README.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/README.md b/README.md
index 4414d379e..5b684b1a4 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
[![Caddy](https://caddyserver.com/resources/images/caddy-boxed.png)](https://caddyserver.com)
-[![Documentation](https://img.shields.io/badge/godoc-reference-blue.svg?style=flat-square)](https://godoc.org/github.com/mholt/caddy)
+[![Documentation](https://img.shields.io/badge/godoc-reference-blue.svg?style=flat-square)](https://godoc.org/github.com/mholt/caddy) [![Build Status](https://img.shields.io/travis/mholt/caddy.svg?style=flat-square)](https://travis-ci.org/mholt/caddy)
-Caddy is a lightweight, general-purpose web server for Windows, Mac, Linux, BSD, and [Android](https://github.com/mholt/caddy/wiki/Running-Caddy-on-Android). It is a capable alternative to other popular web servers.
+Caddy is a lightweight, general-purpose web server for Windows, Mac, Linux, BSD, and [Android](https://github.com/mholt/caddy/wiki/Running-Caddy-on-Android). It is a capable alternative to other popular web servers that is easy to use.
The most notable features are HTTP/2, Virtual Hosts, TLS + SNI, and easy configuration with a [Caddyfile](https://caddyserver.com/docs/caddyfile). Usually, you have one Caddyfile per site. Most directives for the Caddyfile invoke a layer of middleware which can be [used in your own Go programs](https://github.com/mholt/caddy/wiki/Using-Caddy-Middleware-in-Your-Own-Programs).
@@ -31,7 +31,7 @@ Caddy binaries have no dependencies and are available for nearly every platform.
## Running from Source
-NOTE: You will need Go **version 1.4** or greater
+Note: You will need **[Go 1.4](https://golang.org/dl)** or newer
1. `$ go get github.com/mholt/caddy`
2. `cd` into your website's directory
@@ -41,7 +41,7 @@ If you're tinkering, you can also use `go run main.go`.
By default, Caddy serves the current directory at [localhost:2015](http://localhost:2015). You can place a Caddyfile to configure Caddy for serving your site.
-Caddy accepts some flags from the command line. Run `caddy -h` to view the help for flags.
+Caddy accepts some flags from the command line. Run `caddy -h` to view the help for flags. You can also pipe a Caddyfile into the caddy command.