Don't try and restart passenger on machines that don't have it

[chef.git] / README.md

diff --git a/README.md b/README.md
index cebe6e57e74eb39922713cfb5c83634c4bfd98a8..4020d2e9276eb082abc9f7ac63ba5b906243e634 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # OpenStreetMap chef cookbooks
 
+[![Build Status](https://travis-ci.org/openstreetmap/chef.svg?branch=master)](https://travis-ci.org/openstreetmap/chef)
+
 This repository manages the configuration of all the servers run by the
 OpenStreetMap Foundation's Operations Working Group. We use
 [Chef](https://www.chef.io/) to automated the configuration of all of our
@@ -12,7 +14,7 @@ We make extensive use of roles to configure the servers. In general we have:
 ## Server-specific roles (e.g. [katla.rb](roles/katla.rb))
 
 These deal with particular setup or quirks of a server, such as its IP address. They also include roles representing the service they are performing, and the location they are in and any particular hardware they have that needs configuration.
-All our servers are [named after dragons](http://wiki.openstreetmap.org/wiki/Servers/Name_Ideas).
+All our servers are [named after dragons](https://wiki.openstreetmap.org/wiki/Servers/Name_Ideas).
 
 ## Hardware-specific roles (e.g. [tyan-s7010.rb](roles/tyan-s7010.rb))
 
@@ -28,8 +30,13 @@ These cover the services that the server is running, and will include the recipe
 
 # Cookbooks
 
-We use the 'Organization Repository' approach, where we have all our cookbooks in this repository (as opposed to one repository per cookbook). Additionally we don't make use of external cookbooks so every cookbook required is in this repository
+We use the 'Organization Repository' approach, where we have all our cookbooks in this repository (as opposed to one repository per cookbook). Additionally we don't make use of external cookbooks so every cookbook required is in this repository.
 
 # Contributing
 
 Contributions are welcome! Please see [CONTRIBUTING.md](CONTRIBUTING.md) for more details.
+
+# Contact Us
+
+* Twitter: [@OSM_Tech](https://twitter.com/OSM_Tech)
+* IRC: [#OSM-Dev on irc.oftc.net](https://irc.openstreetmap.org/)