<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,132 +1,67 @@
-set :stages, %w(staging production)
-set :default_stage, &quot;production&quot;
-&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD:config/deploy.rb
-
-require File.expand_path(&quot;#{File.dirname(__FILE__)}/../vendor/gems/capistrano-ext-1.2.1/lib/capistrano/ext/multistage&quot;)
-
 #############################################################
 #	Application
 #############################################################
-=======
-require File.expand_path(&quot;#{File.dirname(__FILE__)}/../vendor/gems/capistrano-ext-1.2.1/lib/capistrano/ext/multistage&quot;)
-&gt;&gt;&gt;&gt;&gt;&gt;&gt; fudgestudios/master:config/deploy.rb
-
+require 'capistrano/ext/multistage'
+set :stages, %w(staging production)
+set :default_stage, &quot;production&quot;
+set :application, &quot;yummylogs&quot;
 
-&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD:config/deploy.rb
 #############################################################
 #	Settings
 #############################################################
 
 default_run_options[:pty] = true
 ssh_options[:forward_agent] = true
-set :use_sudo, true
-set :scm_verbose, true
 
 #############################################################
 #	Servers
 #############################################################
 
-set :user, &quot;bort&quot;
-set :gateway, 'gateway.example.com'
-set :domain, &quot;www.example.com&quot;
-server domain, :app, :web
-role :db, domain, :primary =&gt; true
+set :user, 'deploy'
+set :use_sudo, false
+set :gateway, 'gate.pixels-and-bits.com'
+role :web, 'web.pixles-and-bits.com'
+role :app, 'app1.pixles-and-bits.com'
+role :db, 'db.pixels-and-bits', :primary =&gt; true
 
 #############################################################
 #	Git
 #############################################################
 
 set :scm, :git
-set :branch, &quot;master&quot;
-set :scm_user, 'bort'
-set :scm_passphrase, &quot;PASSWORD&quot;
-set :repository, &quot;git@github.com:FudgeStudios/bort.git&quot;
+set :branch, 'master'
+set :scm_user, 'pb-deploy'
+set :repository, &quot;git@github.com:pixels-and-bits/#{application}.git&quot;
+set :deploy_to, &quot;/var/webapps/#{application}/website&quot;
 set :deploy_via, :remote_cache
-set :repository_cache, &quot;repo_cache&quot;
+set :scm_verbose, true
 
 #############################################################
-#	Passenger
+#	recipes
 #############################################################
 
 namespace :deploy do
-  desc &quot;Create the database yaml file&quot;
-  task :after_update_code do
-    deploy:write_db_config
-    
-    #########################################################
-    # Uncomment the following to symlink an uploads directory.
-    # Just change the paths to whatever you need.
-    #########################################################
-    
-    # desc &quot;Symlink the upload directories&quot;
-    # task :before_symlink do
-    #   run &quot;mkdir -p #{shared_path}/uploads&quot;
-    #   run &quot;ln -s #{shared_path}/uploads #{release_path}/public/uploads&quot;
-    # end
+  desc &quot;This to do once we get the code up&quot;
+  task :after_update_code, :roles =&gt; :app, :except =&gt; { :no_release =&gt; true } do
+    send(run_method, &quot;cd #{release_path} &amp;&amp; sudo gemtools install&quot;)
+    deploy:migrate
   end
-  
+
+  #########################################################
+  # Uncomment the following to symlink an uploads directory.
+  # Just change the paths to whatever you need.
+  #########################################################
+
+  # desc &quot;Symlink the upload directories&quot;
+  # task :before_symlink do
+  #   run &quot;mkdir -p #{shared_path}/uploads&quot;
+  #   run &quot;ln -s #{shared_path}/uploads #{release_path}/public/uploads&quot;
+  # end
+
   # Restart passenger on deploy
   desc &quot;Restarting mod_rails with restart.txt&quot;
   task :restart, :roles =&gt; :app, :except =&gt; { :no_release =&gt; true } do
     run &quot;touch #{current_path}/tmp/restart.txt&quot;
-=======
-namespace :db do
-  desc 'Dumps the production database to db/production_data.sql on the remote server'
-  task :remote_db_dump, :roles =&gt; :db, :only =&gt; { :primary =&gt; true } do
-    run &quot;cd #{deploy_to}/#{current_dir} &amp;&amp; &quot; +
-      &quot;rake RAILS_ENV=#{rails_env} db:database_dump --trace&quot; 
-  end
-
-  desc 'Downloads db/production_data.sql from the remote production environment to your local machine'
-  task :remote_db_download, :roles =&gt; :db, :only =&gt; { :primary =&gt; true } do  
-    execute_on_servers(options) do |servers|
-      self.sessions[servers.first].sftp.connect do |tsftp|
-        tsftp.download!(&quot;#{deploy_to}/#{current_dir}/db/production_data.sql&quot;, &quot;db/production_data.sql&quot;)
-      end
-    end
-&gt;&gt;&gt;&gt;&gt;&gt;&gt; fudgestudios/master:config/deploy.rb
-  end
-
-  desc 'Cleans up data dump file'
-  task :remote_db_cleanup, :roles =&gt; :db, :only =&gt; { :primary =&gt; true } do
-    execute_on_servers(options) do |servers|
-      self.sessions[servers.first].sftp.connect do |tsftp|
-        tsftp.remove! &quot;#{deploy_to}/#{current_dir}/db/production_data.sql&quot; 
-      end
-    end
-  end 
-
-  desc 'Dumps, downloads and then cleans up the production data dump'
-  task :remote_db_runner do
-    remote_db_dump
-    remote_db_download
-    remote_db_cleanup
-  end
-&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD:config/deploy.rb
-  
-  desc &quot;Prompts the deployment user for the database password, then generates config/database.yml&quot;
-  task :write_db_config, :roles =&gt; [:app, :db], :except =&gt; { :no_release =&gt; true } do
-    transaction do
-      require &quot;yaml&quot;
-
-      buffer = YAML::load_file('config/database.template.yml')
-      user = buffer[rails_env]['username']
-      host = buffer[rails_env]['host'] || 'localhost'
-      dbname = buffer[rails_env]['database']
-
-      set :deployed_database_password, proc { 
-        Capistrano::CLI.password_prompt(&quot;
-***************
-DB password for #{user}@#{host}:/#{dbname} : &quot;)
-      }
-
-      # set password
-      buffer.keys.each { |env| 
-        buffer[env]['password'] = deployed_database_password
-      }
-
-      put YAML::dump(buffer), &quot;#{release_path}/config/database.yml&quot;, :mode =&gt; 0664
-    end
   end
 end
 
@@ -134,11 +69,11 @@ namespace :db do
   desc 'Dumps the production database to db/production_data.sql on the remote server'
   task :remote_db_dump, :roles =&gt; :db, :only =&gt; { :primary =&gt; true } do
     run &quot;cd #{deploy_to}/#{current_dir} &amp;&amp; &quot; +
-      &quot;rake RAILS_ENV=#{rails_env} db:database_dump --trace&quot; 
+      &quot;rake RAILS_ENV=#{rails_env} db:database_dump --trace&quot;
   end
 
   desc 'Downloads db/production_data.sql from the remote production environment to your local machine'
-  task :remote_db_download, :roles =&gt; :db, :only =&gt; { :primary =&gt; true } do  
+  task :remote_db_download, :roles =&gt; :db, :only =&gt; { :primary =&gt; true } do
     execute_on_servers(options) do |servers|
       self.sessions[servers.first].sftp.connect do |tsftp|
         tsftp.download!(&quot;#{deploy_to}/#{current_dir}/db/production_data.sql&quot;, &quot;db/production_data.sql&quot;)
@@ -150,10 +85,10 @@ namespace :db do
   task :remote_db_cleanup, :roles =&gt; :db, :only =&gt; { :primary =&gt; true } do
     execute_on_servers(options) do |servers|
       self.sessions[servers.first].sftp.connect do |tsftp|
-        tsftp.remove! &quot;#{deploy_to}/#{current_dir}/db/production_data.sql&quot; 
+        tsftp.remove! &quot;#{deploy_to}/#{current_dir}/db/production_data.sql&quot;
       end
     end
-  end 
+  end
 
   desc 'Dumps, downloads and then cleans up the production data dump'
   task :remote_db_runner do
@@ -161,6 +96,4 @@ namespace :db do
     remote_db_download
     remote_db_cleanup
   end
-=======
-&gt;&gt;&gt;&gt;&gt;&gt;&gt; fudgestudios/master:config/deploy.rb
 end
\ No newline at end of file</diff>
      <filename>config/deploy.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,93 +1 @@
-#############################################################
-&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD:config/deploy/production.rb
-#	Settings
-#############################################################
-
-=======
-#	Application
-#############################################################
-
-set :application, &quot;bort&quot;
-set :deploy_to, &quot;/path/to/deploy&quot;
-
-#############################################################
-#	Settings
-#############################################################
-
-default_run_options[:pty] = true
-ssh_options[:forward_agent] = true
-set :use_sudo, true
-set :scm_verbose, true
-&gt;&gt;&gt;&gt;&gt;&gt;&gt; fudgestudios/master:config/deploy/production.rb
-set :rails_env, &quot;production&quot; 
-
-#############################################################
-#	Servers
-#############################################################
-
-&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD:config/deploy/production.rb
-set :domain, &quot;www.example.com&quot;
-server domain, :app, :web
-role :db, domain, :primary =&gt; true
-=======
-set :user, &quot;bort&quot;
-set :domain, &quot;www.example.com&quot;
-server domain, :app, :web
-role :db, domain, :primary =&gt; true
-
-#############################################################
-#	Git
-#############################################################
-
-set :scm, :git
-set :branch, &quot;master&quot;
-set :scm_user, 'bort'
-set :scm_passphrase, &quot;PASSWORD&quot;
-set :repository, &quot;git@github.com:FudgeStudios/bort.git&quot;
-set :deploy_via, :remote_cache
-
-#############################################################
-#	Passenger
-#############################################################
-
-namespace :deploy do
-  desc &quot;Create the database yaml file&quot;
-  task :after_update_code do
-    db_config = &lt;&lt;-EOF
-    production:    
-      adapter: mysql
-      encoding: utf8
-      username: root
-      password: 
-      database: bort_production
-      host: localhost
-    EOF
-    
-    put db_config, &quot;#{release_path}/config/database.yml&quot;
-    
-    #########################################################
-    # Uncomment the following to symlink an uploads directory.
-    # Just change the paths to whatever you need.
-    #########################################################
-    
-    # desc &quot;Symlink the upload directories&quot;
-    # task :before_symlink do
-    #   run &quot;mkdir -p #{shared_path}/uploads&quot;
-    #   run &quot;ln -s #{shared_path}/uploads #{release_path}/public/uploads&quot;
-    # end
-  
-  end
-    
-  # Restart passenger on deploy
-  desc &quot;Restarting mod_rails with restart.txt&quot;
-  task :restart, :roles =&gt; :app, :except =&gt; { :no_release =&gt; true } do
-    run &quot;touch #{current_path}/tmp/restart.txt&quot;
-  end
-  
-  [:start, :stop].each do |t|
-    desc &quot;#{t} task is a no-op with mod_rails&quot;
-    task t, :roles =&gt; :app do ; end
-  end
-  
-end
-&gt;&gt;&gt;&gt;&gt;&gt;&gt; fudgestudios/master:config/deploy/production.rb
+set :rails_env, &quot;production&quot;</diff>
      <filename>config/deploy/production.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,92 +1 @@
-#############################################################
-&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD:config/deploy/staging.rb
-#	Settings
-#############################################################
-
-=======
-#	Application
-#############################################################
-
-set :application, &quot;bort&quot;
-set :deploy_to, &quot;/path/to/deploy&quot;
-
-#############################################################
-#	Settings
-#############################################################
-
-default_run_options[:pty] = true
-ssh_options[:forward_agent] = true
-set :use_sudo, true
-set :scm_verbose, true
-&gt;&gt;&gt;&gt;&gt;&gt;&gt; fudgestudios/master:config/deploy/staging.rb
-set :rails_env, &quot;staging&quot; 
-
-#############################################################
-#	Servers
-#############################################################
-
-&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD:config/deploy/staging.rb
-set :domain, &quot;www.example.com&quot;
-server domain, :app, :web
-role :db, domain, :primary =&gt; true
-=======
-set :user, &quot;bort&quot;
-set :domain, &quot;www.example.com&quot;
-server domain, :app, :web
-role :db, domain, :primary =&gt; true
-
-#############################################################
-#	Git
-#############################################################
-
-set :scm, :git
-set :branch, &quot;master&quot;
-set :scm_user, 'bort'
-set :scm_passphrase, &quot;PASSWORD&quot;
-set :repository, &quot;git@github.com:FudgeStudios/bort.git&quot;
-set :deploy_via, :remote_cache
-
-#############################################################
-#	Passenger
-#############################################################
-
-namespace :deploy do
-  desc &quot;Create the database yaml file&quot;
-  task :after_update_code do
-    db_config = &lt;&lt;-EOF
-    staging:    
-      adapter: mysql
-      encoding: utf8
-      username: root
-      password: 
-      database: bort_staging
-      host: localhost
-    EOF
-    
-    put db_config, &quot;#{release_path}/config/database.yml&quot;
-
-    #########################################################
-    # Uncomment the following to symlink an uploads directory.
-    # Just change the paths to whatever you need.
-    #########################################################
-    
-    # desc &quot;Symlink the upload directories&quot;
-    # task :before_symlink do
-    #   run &quot;mkdir -p #{shared_path}/uploads&quot;
-    #   run &quot;ln -s #{shared_path}/uploads #{release_path}/public/uploads&quot;
-    # end
-  end
-  
-  # Restart passenger on deploy
-  desc &quot;Restarting mod_rails with restart.txt&quot;
-  task :restart, :roles =&gt; :app, :except =&gt; { :no_release =&gt; true } do
-    run &quot;touch #{current_path}/tmp/restart.txt&quot;
-  end
-  
-  [:start, :stop].each do |t|
-    desc &quot;#{t} task is a no-op with mod_rails&quot;
-    task t, :roles =&gt; :app do ; end
-  end
-  
-end
-&gt;&gt;&gt;&gt;&gt;&gt;&gt; fudgestudios/master:config/deploy/staging.rb
+set :rails_env, &quot;staging&quot;</diff>
      <filename>config/deploy/staging.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>405719b0a8e6f6b7c98f43c41b48d4435f78c68c</id>
    </parent>
  </parents>
  <author>
    <name>Michael Moen</name>
    <email>michael@underpantsgnome.com</email>
  </author>
  <url>http://github.com/UnderpantsGnome/bort/commit/72737b180add02a96450d0bfd2e0b2c38651b2e0</url>
  <id>72737b180add02a96450d0bfd2e0b2c38651b2e0</id>
  <committed-date>2008-11-09T13:48:15-08:00</committed-date>
  <authored-date>2008-11-09T13:48:15-08:00</authored-date>
  <message>unf--k the missed merge conflicts</message>
  <tree>925c2230aac114b2c85b9f3c5964ef65f6af1399</tree>
  <committer>
    <name>Michael Moen</name>
    <email>michael@underpantsgnome.com</email>
  </committer>
</commit>
