Undoing some of the changes which reappeared after rebase.

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 7fe4d800acc04c3087605299f00ff8609ecf8f84..74766e6e813cccf687e015c162a252828eb9102c 100644 (file)
--- 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 540ec54d57928e8ed33b87951b6ee5506ac7bc2b..8ad59e5440da90c27e221518b68e409c94f96424 100644 (file)
--- 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 d5b30ba66e856985e8e741a0c684dca24829e96a..6b70cb702e721407a5277a5c5faf6a2aeb7e1e67 100644 (file)
--- 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 a89c3e933ba73a60a4e500adc86dcf7a072833cf..3474840e80904d591aaf11a4a50f043b8fa56cc5 100644 (file)
--- 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 => [