Permalink
Browse files

Ensure to always use the test repo on staging.

Remove 'apt::easybib_different_ppa'.
  • Loading branch information...
1 parent 0a09fa0 commit 077d6f5fcc1320c0bb653615c263553d0197cac9 @till committed Sep 24, 2012
Showing with 5 additions and 13 deletions.
  1. +4 −0 apt/recipes/easybib.rb
  2. +0 −12 apt/recipes/easybib_different_ppa.rb
  3. +1 −1 php-fpm/recipes/install-apt.rb
View
@@ -1,4 +1,8 @@
ppa="easybib/ppa"
+if node.attribute?(:scalarium) && node[:scalarium][:cluster][:name] == "EasyBib Playground"
+ ppa="easybib/test"
+end
+
execute "add #{ppa}" do
command "add-apt-repository ppa:#{ppa}"
end
@@ -1,12 +0,0 @@
-ppa="easybib/ppa"
-if node.attribute?(:scalarium) && node[:scalarium][:cluster][:name] == "EasyBib Playground"
- ppa="easybib/test"
-end
-
-execute "add #{ppa}" do
- command "add-apt-repository ppa:#{ppa}"
-end
-
-execute "update sources" do
- command "apt-get -y -f -q update"
-end
@@ -31,7 +31,7 @@
include_recipe "php-fpm::prepare"
include_recipe "apt::ppa"
-include_recipe "apt::easybib_different_ppa"
+include_recipe "apt::easybib"
aptPackages = node["php-fpm"][:packages]

0 comments on commit 077d6f5

Please sign in to comment.