Added some missing verifiers. Standardized on gnutls SSL packages (in…

…stead of openssl).

config/stack/apache.rb

@@ -5,6 +5,7 @@
   end
 
   verify do
+    has_apt 'apache2'
     has_executable '/usr/sbin/apache2'
   end
 
@@ -15,6 +16,10 @@
 package :apache2_prefork_dev do
   description 'A dependency required by some packages.'
   apt 'apache2-prefork-dev'
+
+  verify do
+    has_apt 'apache2-prefork-dev'
+  end
 end
 
 package :passenger, :provides => :appserver do
@@ -67,6 +72,10 @@
 
 package :passenger_dependencies do
   apt 'libcurl4-gnutls-dev' # Compilation dependency for apache module
+
+  verify do
+    has_apt 'libcurl4-gnutls-dev'
+  end
 end
 
 # These "installers" are strictly optional, I believe

config/stack/essential.rb

@@ -3,4 +3,8 @@
   apt 'build-essential' do
     pre :install, 'apt-get update'
   end
+
+  verify do
+    has_apt 'build-essential'
+  end
 end

config/stack/gems/curb_gem.rb

@@ -12,5 +12,11 @@
 
 package :curb_dependencies do
   requires :build_essential
-  apt %w(libcurl3 libcurl3-gnutls libcurl4-openssl-dev)
+  apt %w(libcurl3 libcurl3-gnutls libcurl4-gnutls-dev)
+
+  verify do
+    has_apt 'libcurl3'
+    has_apt 'libcurl3-gnutls'
+    has_apt 'libcurl4-gnutls-dev'
+  end
 end

config/stack/git.rb

@@ -18,4 +18,8 @@
   github_key = File.read(File.join(File.dirname(__FILE__), 'git', 'github_key.txt'))
   # Don't require verification of github's ssh fingerprint for anyone on the system
   push_text github_key, '/etc/ssh/ssh_known_hosts', :sudo => true
+
+  verify do
+    file_contains '/etc/ssh/ssh_known_hosts', 'github.com'
+  end
 end

config/stack/ruby_enterprise.rb

@@ -26,4 +26,11 @@
 package :ree_dependencies do
   apt %w(zlib1g-dev libreadline-dev libssl-dev)
   requires :build_essential
+
+  verify do
+    has_apt 'zlib1g-dev'
+    has_apt 'libreadline-dev'
+    has_apt 'libssl-dev'
+    has_apt 'curl'
+  end
 end