capistrano: defined? wasn't working well in this case. Switching to b…

…egin/rescue is working much better now.

lib/recipes/apache.rb

@@ -29,7 +29,7 @@
     end
 
     def set_apache_clt
-      set :apache_ctl, "/etc/init.d/apache2" unless defined?(apache_ctl)
+      begin; apache_ctl; rescue; set(:apache_ctl, "/etc/init.d/apache2"); end
     end
 
   end

lib/recipes/db.rb

@@ -11,7 +11,7 @@
     end
 
     def set_app_environment
-      set :app_environment, 'production' unless defined?(app_environment)
+      begin; app_environment; rescue; set(:app_environment, 'production'); end
     end
 
   end

lib/recipes/deploy.rb

@@ -36,7 +36,7 @@
   end
 
   def set_app_server
-    set :app_server, :apache unless defined?(app_server)
+    begin; app_server; rescue; set(:app_server, :apache); end
     raise "Unknown Application Server #{app_server}" unless [:apache, :mongrel].include?(app_server)
   end
 

lib/recipes/kete.rb

@@ -102,7 +102,7 @@ def symlink_system_directory(dir, is_public=true)
     end
 
     def set_app_environment
-      set :app_environment, 'production' unless defined?(app_environment)
+      begin; app_environment; rescue; set(:app_environment, 'production'); end
     end
 
   end

lib/recipes/mongrel.rb

@@ -46,7 +46,7 @@
     end
 
     def set_mongrel_conf
-      set :mongrel_conf, "/etc/mongrel_cluster/#{application}.yml" unless defined?(mongrel_conf)
+      begin; mongrel_conf; rescue; set(:mongrel_conf, "/etc/mongrel_cluster/#{application}.yml"); end
     end
 
   end