From: Grant Slater <git@firefishy.com>
Date: Fri, 18 Oct 2013 15:15:43 +0000 (+0100)
Subject: Add nginx stable repo + enable on tilecaches
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/5b61dc78ec8857086174b99aa68ec7ee7f439e0b

Add nginx stable repo + enable on tilecaches
---

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index d3ec6e4c5..f11894a76 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -109,3 +109,9 @@ apt_source "mapnik-v210" do
   url "http://ppa.launchpad.net/mapnik/v2.1.0/ubuntu"
   key "5D50B6BA"
 end
+
+apt_source "nginx" do
+  url "http://nginx.org/packages/ubuntu"
+  key "7BD9BF62"
+end
+
diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index daaaddf2c..bbabdea11 100644
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -2,6 +2,9 @@ name "tilecache"
 description "Role applied to all tile cache servers"
 
 default_attributes(
+  :apt => {
+    :sources => [ "nginx" ]
+  },
   :sysctl => {
     :network_conntrack_time_wait => {
       :comment => "Only track completed connections for 30 seconds",