Permalink
Browse files

Revert "Added 'lamp stack removed' to clean up apt systems before ins…

…talling nginx. (e.g. rimuhosting instances come with a lamp stack preinstalled)."

This reverts commit 268fe91.

Conflicts:

	nginx.rb
  • Loading branch information...
benhoskings committed Jan 20, 2011
1 parent 8daacc4 commit 7e5dd2c7d72bce1c9babbbe58e8603c2d89239c1
Showing with 1 addition and 22 deletions.
  1. +1 −22 nginx.rb
View
@@ -157,7 +157,7 @@ def restart_nginx
end
dep 'webserver installed.src' do
- requires 'lamp stack removed', 'passenger built', 'pcre.managed', 'libssl headers.managed', 'zlib headers.managed'
+ requires 'passenger built', 'pcre.managed', 'libssl headers.managed', 'zlib headers.managed'
merge :versions, {:nginx => '0.8.54', :nginx_upload_module => '2.2.0'}
source "http://nginx.org/download/nginx-#{var(:versions)[:nginx]}.tar.gz"
extra_source "http://www.grid.net.ru/nginx/download/nginx_upload_module-#{var(:versions)[:nginx_upload_module]}.tar.gz"
@@ -189,24 +189,3 @@ def restart_nginx
end
}
end
-
-dep 'lamp stack removed', :for => :apt do
- def packages
- shell("dpkg --get-selections").split("\n").map {|l|
- l.split(/\s+/, 2).first
- }.select {|l|
- l[/apache|mysql|php/]
- }
- end
- met? {
- packages.empty?
- }
- meet {
- packages.each {|pkg|
- log_shell "Removing #{pkg}", "apt-get -y remove --purge '#{pkg}'", :sudo => true
- }
- }
- after {
- log_shell "Autoremoving packages", "apt-get -y autoremove", :sudo => true
- }
-end

0 comments on commit 7e5dd2c

Please sign in to comment.