<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,2 +1,3 @@
 load 'deploy' if respond_to?(:namespace) # cap2 differentiator
+Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
 load 'config/deploy'
\ No newline at end of file</diff>
      <filename>Capfile</filename>
    </modified>
    <modified>
      <diff>@@ -5,6 +5,9 @@ require(File.join(File.dirname(__FILE__), 'config', 'boot'))
 
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+begin
+  require 'rake/rdoctask'
+rescue LoadError
+end
 
 require 'tasks/rails'</diff>
      <filename>Rakefile</filename>
    </modified>
    <modified>
      <diff>@@ -1,13 +1,38 @@
-load File.join(File.dirname(__FILE__), '..', 'vendor', 'plugins', 'lwt_deployment', 'recipes')
+default_run_options[:pty] = true
 
 set :application, &quot;calvincs&quot;
-set :repository_host, &quot;csforge.calvin.edu&quot;
-set(:repository) { &quot;https://#{repository_host}/svn/DepartmentWebsites/RoR/#{application}&quot; }
-set(:deploy_to) { &quot;/srv/www/#{application}/#{rails_env}&quot; }
-
-# Used for web.disable and web.enable
-role :web, &quot;cs.calvin.edu&quot;
-# Used for deploy.start, deploy.stop, deploy.restart
-role :app, &quot;cs.calvin.edu&quot;
-# Used for deploy.migrate
-role :db, &quot;cs.calvin.edu&quot;, :primary =&gt; true
+
+set :scm, &quot;git&quot;
+set :repository,  &quot;git://github.com/jdfrens/calvincs.git&quot;
+set :branch, &quot;master&quot;
+# set :scm_passphrase, &quot;p@ssw0rd&quot; #This is your custom users password
+set :user, &quot;calvincs&quot;
+
+# If you have previously been relying upon the code to start, stop 
+# and restart your mongrel application, or if you rely on the database
+# migration code, please uncomment the lines you require below
+
+# If you are deploying a rails app you probably need these:
+
+#load 'ext/rails-database-migrations.rb'
+#load 'ext/rails-shared-directories.rb'
+
+# There are also new utility libaries shipped with the core these 
+# include the following, please see individual files for more
+# documentation, or run `cap -vT` with the following lines commented
+# out to see what they make available.
+
+# load 'ext/spinner.rb'              # Designed for use with script/spin
+# load 'ext/passenger-mod-rails.rb'  # Restart task for use with mod_rails
+# load 'ext/web-disable-enable.rb'   # Gives you web:disable and web:enable
+
+# If you aren't deploying to /u/apps/#{application} on the target
+# servers (which is the default), you can specify the actual location
+# via the :deploy_to variable:
+set :deploy_to, &quot;/srv/www/#{application}&quot;
+
+set :gateway, &quot;jdfrens@cs-ssh.calvin.edu&quot;
+
+role :web, &quot;yags.calvin.edu&quot;
+role :app, &quot;yags.calvin.edu&quot;
+role :db, &quot;yags.calvin.edu&quot;, :primary =&gt; true</diff>
      <filename>config/deploy.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>9e947ffe94f5dadff83d66fb3d77fdb96386f285</id>
    </parent>
  </parents>
  <author>
    <name>Jeremy D. Frens</name>
    <email>jdfrens@gmail.com</email>
  </author>
  <url>http://github.com/jdfrens/calvincs/commit/c225252a669d5de6c4c2c8328a9f9787e5c621e6</url>
  <id>c225252a669d5de6c4c2c8328a9f9787e5c621e6</id>
  <committed-date>2009-09-29T15:21:48-07:00</committed-date>
  <authored-date>2009-09-29T15:21:48-07:00</authored-date>
  <message>tweaking deployment</message>
  <tree>961399961c772cd4bd3cf0835de5132e9a96270d</tree>
  <committer>
    <name>Jeremy D. Frens</name>
    <email>jdfrens@gmail.com</email>
  </committer>
</commit>
