From: Matt Amos <zerebubuth@gmail.com>
Date: Mon, 3 Oct 2016 16:39:08 +0000 (+0100)
Subject: Undoing some of the changes which reappeared after rebase.
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/c68db50b84bdc697235138dd9c4aebe368393e9e?hp=b9c1035ceee9fd2fc76c1488d056b9eb57ae84f2

Undoing some of the changes which reappeared after rebase.
---

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 7fe4d800a..74766e6e8 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -130,11 +130,6 @@ apt_source "mediawiki" do
   key "90E9F83F22250DD7"
 end
 
-apt_source "openstreetmap-cgimap" do
-  url "http://ppa.launchpad.net/zerebubuth/openstreetmap-cgimap/ubuntu"
-  key "CDADED50"
-end
-
 package "unattended-upgrades"
 
 if Dir.exist?("/usr/share/unattended-upgrades")
diff --git a/cookbooks/web/attributes/default.rb b/cookbooks/web/attributes/default.rb
index 540ec54d5..8ad59e544 100644
--- a/cookbooks/web/attributes/default.rb
+++ b/cookbooks/web/attributes/default.rb
@@ -1,6 +1,3 @@
 default[:web][:base_directory] = "/srv/www.openstreetmap.org"
 default[:web][:pid_directory] = "/var/run/web"
 default[:web][:log_directory] = "/var/log/web"
-
-# need the APT source for cgimap to be able to install the package
-default[:apt][:sources] = node[:apt][:sources] | ["openstreetmap-cgimap"]
diff --git a/cookbooks/web/recipes/base.rb b/cookbooks/web/recipes/base.rb
index d5b30ba66..6b70cb702 100644
--- a/cookbooks/web/recipes/base.rb
+++ b/cookbooks/web/recipes/base.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-node.set[:nfs]["/store/rails"] = {
+node.default[:nfs]["/store/rails"] = {
   :host => node[:web][:fileserver],
   :path => "/store/rails"
 }
diff --git a/roles/web-backend.rb b/roles/web-backend.rb
index a89c3e933..3474840e8 100644
--- a/roles/web-backend.rb
+++ b/roles/web-backend.rb
@@ -8,9 +8,6 @@ default_attributes(
       :max_requests_per_child => 10000
     }
   },
-  :apt => {
-    :sources => ["openstreetmap-cgimap"]
-  },
   :logstash => {
     :forwarder => {
       :files => [