From: Tom Hughes <tom@compton.nu>
Date: Sun, 26 Oct 2014 11:20:58 +0000 (+0000)
Subject: Update chef server version mapping
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/f3ec357c6cb5121fefda513fb35d79caa41745dd?ds=inline

Update chef server version mapping
---

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index 614eb81b4..5cc28fa69 100644
--- a/cookbooks/chef/recipes/server.rb
+++ b/cookbooks/chef/recipes/server.rb
@@ -21,6 +21,7 @@ include_recipe "apache::ssl"
 
 chef_platform = case node[:platform_version]
                   when "12.10" then "12.04"
+                  when "14.04" then "12.04"
                   else node[:platform_version]
                 end
 
diff --git a/roles/web.rb b/roles/web.rb
index 30069f148..227aba505 100644
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -17,7 +17,7 @@ default_attributes(
     :pool_idle_time => 0
   },
   :web => {
-    :status => "online",
+    :status => "offline",
     :database_host => "db",
     :readonly_database_host => "katla"
   }