X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/13f8835f70746c764e25dfd76a285302233e5136..956ffe2008afb266d5fa00010e642e8af03c48b0:/cookbooks/apt/recipes/default.rb

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 65f625a0b..e0e000c3a 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -34,18 +34,7 @@ template "/etc/apt/sources.list" do
   owner "root"
   group "root"
   mode 0644
-  notifies :run, resources(:execute => "apt-update")
-end
-
-apt_source "opscode" do
-  template "opscode.list.erb"
-  url "http://apt.opscode.com/"
-  key "83EF826A"
-end
-
-apt_source "brightbox" do
-  url "http://apt.brightbox.net/"
-  key "0090DAAD"
+  notifies :run, "execute[apt-update]", :immediately
 end
 
 apt_source "brightbox-ruby-ng" do
@@ -53,16 +42,6 @@ apt_source "brightbox-ruby-ng" do
   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"
@@ -73,34 +52,20 @@ apt_source "ubuntugis-unstable" do
   key "314DF160"
 end
 
-apt_source "brianmercer-php" do
-  url "http://ppa.launchpad.net/brianmercer/php/ubuntu"
-  key "8D0DC64F"
-end
-
-apt_source "aw-drupal" do
-  url "http://ppa.launchpad.net/aw/drupal/ubuntu"
-  key "7D5AE8F6"
-end
-
 apt_source "openstreetmap" do
+  template "openstreetmap.list.erb"
   url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
   key "0AC4F2CB"
 end
 
-apt_source "proliant-support-pack" do
-  template "hp.list.erb"
-  url "http://downloads.linux.hp.com/SDR/downloads/ProLiantSupportPack"
-  key "2689B887"
-end
-
 apt_source "management-component-pack" do
   template "hp.list.erb"
-  url "http://downloads.linux.hp.com/SDR/downloads/ManagementComponentPack"
-  key "2689B887"
+  url "http://downloads.linux.hpe.com/SDR/repo/mcp"
+  key "B1275EA3"
 end
 
 apt_source "hwraid" do
+  template "hwraid.list.erb"
   url "http://hwraid.le-vert.net/ubuntu"
   key "23B3D3B4"
 end
@@ -115,3 +80,60 @@ apt_source "nginx" do
   url "http://nginx.org/packages/ubuntu"
   key "7BD9BF62"
 end
+
+apt_source "elasticsearch" do
+  template "elasticsearch.list.erb"
+  url "http://packages.elasticsearch.org/elasticsearch/1.7/debian"
+  key "D88E42B4"
+end
+
+apt_source "logstash" do
+  template "elasticsearch.list.erb"
+  url "http://packages.elasticsearch.org/logstash/1.5/debian"
+  key "D88E42B4"
+end
+
+apt_source "logstash-forwarder" do
+  template "elasticsearch.list.erb"
+  url "http://packages.elasticsearch.org/logstashforwarder/debian"
+  key "D88E42B4"
+end
+
+apt_source "passenger" do
+  url "https://oss-binaries.phusionpassenger.com/apt/passenger"
+  key "AC40B2F7"
+end
+
+apt_source "postgresql" do
+  template "postgresql.list.erb"
+  url "http://apt.postgresql.org/pub/repos/apt"
+  key "ACCC4CF8"
+end
+
+apt_source "mediawiki" do
+  template "mediawiki.list.erb"
+  url "https://releases.wikimedia.org/debian"
+  key "664C383A3566A3481B942F007A322AC6E84AFDD2"
+end
+
+package "unattended-upgrades"
+
+auto_upgrades = if node[:apt][:unattended_upgrades][:enable]
+                  IO.read("/usr/share/unattended-upgrades/20auto-upgrades")
+                else
+                  IO.read("/usr/share/unattended-upgrades/20auto-upgrades-disabled")
+                end
+
+file "/etc/apt/apt.conf.d/20auto-upgrades" do
+  user "root"
+  group "root"
+  mode 0644
+  content auto_upgrades
+end
+
+template "/etc/apt/apt.conf.d/60chef" do
+  source "apt.conf.erb"
+  owner "root"
+  group "root"
+  mode 0644
+end