Tune firewall connection tracking for nominatim

[chef.git] / cookbooks / apt / recipes / default.rb

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 792ce6aa31eb3be693c3600bf57037c09c257521..659e06536b6ba13ef159f11e3b3cd406264f9c22 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -42,26 +42,11 @@ template "/etc/apt/sources.list" do
   notifies :run, "execute[apt-update]"
 end
 
   notifies :run, "execute[apt-update]"
 end
 

-apt_source "brightbox" do
-  url "http://apt.brightbox.net/"
-  key "0090DAAD"
-end
-

 apt_source "brightbox-ruby-ng" do
   url "http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu"
   key "C3173AA6"
 end
 
 apt_source "brightbox-ruby-ng" do
   url "http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu"
   key "C3173AA6"
 end
 

-apt_source "brightbox-ruby-ng-experimental" do
-  url "http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu-experimental"
-  key "C3173AA6"
-end
-
-apt_source "pitti-postgresql" do
-  url "http://ppa.launchpad.net/pitti/postgresql/ubuntu"
-  key "8683D8A2"
-end
-

 apt_source "ubuntugis-stable" do
   url "http://ppa.launchpad.net/ubuntugis/ppa/ubuntu"
   key "314DF160"
 apt_source "ubuntugis-stable" do
   url "http://ppa.launchpad.net/ubuntugis/ppa/ubuntu"
   key "314DF160"


@@ -72,16 +57,10 @@ apt_source "ubuntugis-unstable" do
   key "314DF160"
 end
 
   key "314DF160"
 end
 

-apt_source "brianmercer-php" do
-  url "http://ppa.launchpad.net/brianmercer/php/ubuntu"
-  key "8D0DC64F"
-end
-
-if node[:lsb][:release].to_f < 14.04
-  apt_source "openstreetmap" do
-    url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
-    key "0AC4F2CB"
-  end
+apt_source "openstreetmap" do
+  template "openstreetmap.list.erb"
+  url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
+  key "0AC4F2CB"

 end
 
 apt_source "management-component-pack" do
 end
 
 apt_source "management-component-pack" do