From f4ea2c7270a0b80748cc3efb58d12300b4c2061e Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 7 Dec 2015 14:35:09 +0000 Subject: [PATCH 1/1] Drop support for passenger 4 --- cookbooks/apt/recipes/default.rb | 5 ----- cookbooks/passenger/attributes/default.rb | 7 +------ 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb index ab1285e92..7467ef16b 100644 --- a/cookbooks/apt/recipes/default.rb +++ b/cookbooks/apt/recipes/default.rb @@ -104,11 +104,6 @@ apt_source "passenger" do key "AC40B2F7" end -apt_source "passenger4" do - url "https://oss-binaries.phusionpassenger.com/apt/passenger/4" - key "AC40B2F7" -end - apt_source "postgresql" do template "postgresql.list.erb" url "http://apt.postgresql.org/pub/repos/apt" diff --git a/cookbooks/passenger/attributes/default.rb b/cookbooks/passenger/attributes/default.rb index 9af69741f..56816eac7 100644 --- a/cookbooks/passenger/attributes/default.rb +++ b/cookbooks/passenger/attributes/default.rb @@ -1,10 +1,5 @@ -default[:passenger][:version] = 5 default[:passenger][:ruby_version] = "1.9.1" default[:passenger][:max_pool_size] = 6 default[:passenger][:pool_idle_time] = 300 -if node[:passenger][:version] == 4 - default[:apt][:sources] = node[:apt][:sources] | ["brightbox-ruby-ng", "passenger4"] -else - default[:apt][:sources] = node[:apt][:sources] | ["brightbox-ruby-ng", "passenger"] -end +default[:apt][:sources] = node[:apt][:sources] | ["brightbox-ruby-ng", "passenger"] -- 2.43.2