Improve handling of apache mpm selection

[chef.git] / README.md

diff --git a/README.md b/README.md
index 99a7de1d5740f6a17f1e82fd0cda9adb46e4025b..8707c7b461c18a3d46329c097cf8d7a692fd4f26 100644 (file)
--- a/README.md
+++ b/README.md
@@ -7,6 +7,8 @@ OpenStreetMap Foundation's Operations Working Group. We use
 [Chef](https://www.chef.io/) to automated the configuration of all of our
 servers.
 
 [Chef](https://www.chef.io/) to automated the configuration of all of our
 servers.
 

+[OSMF Operations Working Group](https://operations.osmfoundation.org/)
+

 # Roles
 
 We make extensive use of roles to configure the servers. In general we have:
 # Roles
 
 We make extensive use of roles to configure the servers. In general we have:


@@ -14,13 +16,13 @@ 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.
 ## 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))
 
 Covers anything specific to a certain piece of hardware, like a motherboard, that could apply to multiple machines.
 
 
 ## Hardware-specific roles (e.g. [tyan-s7010.rb](roles/tyan-s7010.rb))
 
 Covers anything specific to a certain piece of hardware, like a motherboard, that could apply to multiple machines.
 

-## Location-specific roles (e.g. [ic.rb](roles/ic.rb))
+## Location-specific roles (e.g. [equinix.rb](roles/equinix.rb))

 
 These form a hierarchy of datacentres, organisations, and countries where our servers are located.
 
 
 These form a hierarchy of datacentres, organisations, and countries where our servers are located.
 


@@ -30,8 +32,13 @@ These cover the services that the server is running, and will include the recipe
 
 # Cookbooks
 
 
 # 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.
 
 # 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/)