From ed04ff64f92b568942e644a8920c07e50e7d7394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=C3=B1or=20Rolando?= Date: Sat, 26 Jan 2013 23:37:24 +0100 Subject: [PATCH] Switch from railshosting.de to vserver and from MySQL to PostgreSQL. --- Gemfile | 2 +- Gemfile.lock | 4 ++-- config/deploy.rb | 35 +++++++++++++++-------------------- 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/Gemfile b/Gemfile index 9ec0223..84aee89 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'http://rubygems.org' gem 'rails', '3.2.11' -gem 'mysql2', '0.3.11' +gem 'pg' gem 'bootstrap-sass', '2.0.2' diff --git a/Gemfile.lock b/Gemfile.lock index b01ac77..c3ef6d6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -100,7 +100,6 @@ GEM polyamorous (~> 0.5.0) mime-types (1.19) multi_json (1.5.0) - mysql2 (0.3.11) net-scp (1.0.4) net-ssh (>= 1.99.1) net-sftp (2.0.5) @@ -109,6 +108,7 @@ GEM net-ssh-gateway (1.1.0) net-ssh (>= 1.99.1) orm_adapter (0.0.7) + pg (0.14.0) polyamorous (0.5.0) activerecord (~> 3.0) polyglot (0.3.3) @@ -175,7 +175,7 @@ DEPENDENCIES devise (= 2.0.4) json (= 1.6.5) mail - mysql2 (= 0.3.11) + pg rails (= 3.2.11) sass-rails (= 3.2.5) uglifier diff --git a/config/deploy.rb b/config/deploy.rb index 7220dd6..135804e 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -2,29 +2,24 @@ # require 'bundler/capistrano' set :application, "contactorama" -set :local_repository, "web1@railshosting.de:/files/repositories/git/contactorama.git" -set :repository, "/var/www/htdocs/web1/files/repositories/git/contactorama.git" +set :local_repository, "apps@tailorama.com:/opt/git-repo/contactorama.git" +set :repository, "/opt/git-repo/contactorama.git" -set :deploy_to, "/var/www/htdocs/web1/files/rails/#{application}" -set :symlink_path, "/var/www/htdocs/web1/html/rails/#{application}" +set :deploy_to, "/home/apps/rails/#{application}" +#set :symlink_path, "/var/www/htdocs/web1/html/rails/#{application}" set :scm, :git # Or: `accurev`, `bzr`, `cvs`, `darcs`, `git`, `mercurial`, `perforce`, `subversion` or `none` -set :user, "web1" -ssh_options[:port] = 981 +set :user, "apps" +# ssh_options[:port] = 981 set :use_sudo, false set :deploy_via, :remote_cache -role :web, "railshosting.de" # Your HTTP server, Apache/etc -role :app, "railshosting.de" # This may be the same as your `Web` server -role :db, "railshosting.de", :primary => true # This is where Rails migrations will run -# role :db, "railshosting.de" - -# extend $PATH to make sure that 'rake' can be found. -set :default_environment, { - 'PATH' => "/var/www/htdocs/web1/.gem/ruby/1.9.1/bin/:$PATH" -} +role :web, "tailorama.com" # Your HTTP server, Apache/etc +role :app, "tailorama.com" # This may be the same as your `Web` server +role :db, "tailorama.com", :primary => true # This is where Rails migrations will run +# role :db, "tailorama.com" # copy shared files after update task :update_config, :roles => :app do @@ -32,12 +27,12 @@ task :update_config, :roles => :app do end # create symlink after setup -task :symlink_config, :roles => :app do - run "mkdir -p /var/www/htdocs/#{user}/html/rails" - run "ln -nfs #{current_path}/public #{symlink_path}" -end +# task :symlink_config, :roles => :app do +# run "mkdir -p /var/www/htdocs/#{user}/html/rails" +# run "ln -nfs #{current_path}/public #{symlink_path}" +# end -after "deploy:setup", :symlink_config +#after "deploy:setup", :symlink_config after "deploy:update_code", :update_config # mod_rails (phusion_passenger) stuff