isaac-deprec 1.99.30 → 1.99.32

data/lib/deprec/recipes/mysql.rb

@@ -3,17 +3,21 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :deprec do
     namespace :mysql do
       
+      set :mysql_admin_user, 'root'
+      set(:mysql_admin_pass) { Capistrano::CLI.password_prompt "Enter database password for '#{mysql_admin_user}':"}
+      
       # Installation
       
       desc "Install mysql"
       task :install, :roles => :db do
         install_deps
+        start
         # symlink_mysql_sockfile # XXX still needed?
       end
       
       # Install dependencies for Mysql
       task :install_deps, :roles => :db do
-        apt.install( {:base => %w(mysql-server mysql-client)}, :stable )
+        apt.install( {:base => %w(mysql-server mysql-client libmysqlclient15-dev)}, :stable )
       end
       
       # task :symlink_mysql_sockfile, :roles => :db do
@@ -81,6 +85,31 @@ Capistrano::Configuration.instance(:must_exist).load do
       
       task :restore, :roles => :db do
       end
+      
+      desc "Create a mysql user"
+      task :create_user, :roles => :db do
+        # TBA
+      end
+      
+      desc "Create a database" 
+      task :create_database, :roles => :db do
+        cmd = "CREATE DATABASE IF NOT EXISTS #{db_name}"
+        run "mysql -u #{mysql_admin_user} -p -e '#{cmd}'" do |channel, stream, data|
+          if data =~ /^Enter password:/
+             channel.send_data "#{mysql_admin_pass}\n"
+           end
+        end       
+      end
+      
+      desc "Grant user access to database" 
+      task :grant_user_access_to_database, :roles => :db do        
+        cmd = "GRANT ALL PRIVILEGES ON #{db_name}.* TO '#{db_user}'@localhost IDENTIFIED BY '#{db_password}';"
+        run "mysql -u #{mysql_admin_user} -p #{db_name} -e \"#{cmd}\"" do |channel, stream, data|
+          if data =~ /^Enter password:/
+             channel.send_data "#{mysql_admin_pass}\n"
+           end
+        end
+      end
             
     end
   end

data/lib/deprec/recipes/network.rb

@@ -29,7 +29,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         result
       }
       set(:network_hostname) { 
-        Capistrano::CLI.ui.ask "hostname" do |q|
+        Capistrano::CLI.ui.ask "Enter the hostname for the server" do |q|
           # q.validate = /add hostname validation here/
         end 
       } 

data/lib/deprec/recipes/nginx.rb

@@ -22,11 +22,9 @@ Capistrano::Configuration.instance(:must_exist).load do
         deprec2.download_src(SRC_PACKAGES[:nginx], src_dir)
         deprec2.install_from_src(SRC_PACKAGES[:nginx], src_dir)
         create_nginx_user
-        # install_index_page  # XXX not done yet
-        SYSTEM_CONFIG_FILES[:nginx].each do |file|
-          deprec2.render_template(:nginx, file.merge(:remote => true))
-        end
+        initial_config
         activate
+        start
       end
 
       # install dependencies for nginx
@@ -62,7 +60,26 @@ Capistrano::Configuration.instance(:must_exist).load do
           :mode => 0644,
           :owner => 'root:root'}
       ]
+      
+      PROJECT_CONFIG_FILES[:nginx] = [
+      
+        {:template => 'rails_nginx_vhost.conf.erb',
+         :path => "rails_nginx_vhost.conf", 
+         :mode => 0644,
+         :owner => 'root:root'},
+           
+        {:template => 'logrotate.conf.erb',
+         :path => "logrotate.conf", 
+         :mode => 0644,
+         :owner => 'root:root'}  
+      ]
 
+      task :initial_config do
+        SYSTEM_CONFIG_FILES[:nginx].each do |file|
+          deprec2.render_template(:nginx, file.merge(:remote => true))
+        end
+      end
+      
       desc <<-DESC
       Generate nginx config from template. Note that this does not
       push the config to the server, it merely generates required
@@ -74,11 +91,33 @@ Capistrano::Configuration.instance(:must_exist).load do
           deprec2.render_template(:nginx, file)
         end
       end
+      
+      desc "Generate config files for rails app."
+      task :config_gen_project do
+        PROJECT_CONFIG_FILES[:nginx].each do |file|
+          deprec2.render_template(:nginx, file)
+        end
+      end
 
       desc "Push nginx config files to server"
       task :config, :roles => :web do
         deprec2.push_configs(:nginx, SYSTEM_CONFIG_FILES[:nginx])
       end
+      
+      desc "Push out config files for rails app."
+      task :config_project, :roles => :web do
+        deprec2.push_configs(:nginx, PROJECT_CONFIG_FILES[:nginx])
+        symlink_nginx_vhost
+        symlink_nginx_logrotate_config
+      end
+      
+      task :symlink_nginx_vhost, :roles => :web do
+        sudo "ln -sf #{deploy_to}/nginx/rails_nginx_vhost.conf #{nginx_vhost_dir}/#{application}.conf"
+      end
+      
+      task :symlink_nginx_logrotate_config, :roles => :web do
+        sudo "ln -sf #{deploy_to}/nginx/logrotate.conf /etc/logrotate.d/nginx-#{application}"
+      end
 
       desc <<-DESC
       Activate nginx start scripts on server.
@@ -104,25 +143,29 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       desc "Start Nginx"
       task :start, :roles => :web do
-        send(run_method, "/etc/init.d/nginx start")
+        # Nginx returns error code if you try to start it when it's already running
+        # We don't want this to kill Capistrano.
+        send(run_method, "/etc/init.d/nginx start; exit 0")
       end
 
       desc "Stop Nginx"
       task :stop, :roles => :web do
-        send(run_method, "/etc/init.d/nginx stop")
+        # Nginx returns error code if you try to stop when it's not running
+        # We don't want this to kill Capistrano. 
+        send(run_method, "/etc/init.d/nginx stop; exit 0") 
       end
 
       desc "Restart Nginx"
       task :restart, :roles => :web do
-        # So that restart will work even if nginx is not running
-        # we call stop and ignore the return code. We then start it.
-        send(run_method, "/etc/init.d/nginx stop; exit 0")
-        send(run_method, "/etc/init.d/nginx start")
+        stop
+        start
       end
 
       desc "Reload Nginx"
       task :reload, :roles => :web do
-        send(run_method, "/etc/init.d/nginx reload")
+        # Nginx returns error code if you try to reload when it's not running
+        # We don't want this to kill Capistrano.
+        send(run_method, "/etc/init.d/nginx reload; exit 0")
       end
 
       task :backup, :roles => :web do
@@ -141,4 +184,4 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     end 
   end
-end
+end

data/lib/deprec/recipes/passenger.rb

@@ -2,13 +2,18 @@
 Capistrano::Configuration.instance(:must_exist).load do 
   namespace :deprec do 
     namespace :passenger do
+          
+      set(:passenger_install_dir) { 
+        if passenger_use_ree
+          "#{ree_install_dir}/lib/ruby/gems/1.8/gems/passenger-2.0.6"
+        else
+          '/opt/passenger'
+        end
+      }
       
-      set :passenger_version, "passenger-2.1.0"
-      set :passenger_filename, "#{passenger_version}.tar.gz"
-      set :passenger_install_dir, "/opt/#{passenger_version}"
       set(:passenger_document_root) { "#{current_path}/public" }
       set :passenger_rails_allow_mod_rewrite, 'off'
-      set :passenger_vhost_dir, '/etc/apache2/sites-enabled'
+      set :passenger_vhost_dir, '/etc/apache2/sites-available'
       # Default settings for Passenger config files
       set :passenger_log_level, 0
       set :passenger_user_switching, 'on'
@@ -20,18 +25,65 @@ Capistrano::Configuration.instance(:must_exist).load do
       set :passenger_rails_spawn_method, 'smart' # smart | conservative
 
       SRC_PACKAGES[:passenger] = {
-        :md5 => "8e53ce6aee19afcf5cff88cf20fe4159  #{passenger_filename}"
-        :url => "http://github.com/isaac/passenger/raw/master/pkg/#{passenger_filename}",
-        :unpack => "tar xzvf #{passenger_filename};",
+        :url => "git://github.com/FooBarWidget/passenger.git",
+        :download_method => :git,
+        :version => 'release-2.0.6', # Specify a tagged release to deploy
         :configure => '',
         :make => '',
-        :install => './bin/passenger-install-apache2-module --auto'
+        :install => './bin/passenger-install-apache2-module'
       }
+
+      desc "Install passenger"
+      task :install, :roles => :app do
+        install_deps
+        deprec2.download_src(SRC_PACKAGES[:passenger], src_dir)
+
+        if passenger_use_ree
+          # Install the Passenger that came with Ruby Enterprise Edition
+          run "yes | #{sudo} env PATH=#{ree_install_dir}/bin:$PATH #{ree_install_dir}/bin/passenger-install-apache2-module"
+        else
+          # Non standard - passenger requires input
+          package_dir = File.join(src_dir, 'passenger.git')
+          dest_dir = passenger_install_dir + '-' + (SRC_PACKAGES[:passenger][:version] || 'trunk')
+          run "#{sudo} rsync -avz #{package_dir}/ #{dest_dir}"
+          run "cd #{dest_dir} && yes '' | #{sudo} ./bin/passenger-install-apache2-module"
+          run "#{sudo} unlink #{passenger_install_dir} 2>/dev/null; #{sudo} ln -sf #{dest_dir} #{passenger_install_dir}"
+        end
+        
+        initial_config_push
+        
+      end
+      
+      task :initial_config_push, :roles => :web do
+        # XXX Non-standard!
+        # We need to push out the .load and .conf files for Passenger
+        SYSTEM_CONFIG_FILES[:passenger].each do |file|
+          deprec2.render_template(:passenger, file.merge(:remote => true))
+        end
+      end
+
+      # Install dependencies for Passenger
+      task :install_deps, :roles => :app do
+        apt.install( {:base => %w(apache2-mpm-prefork apache2-prefork-dev rsync)}, :stable )
+        gem2.install 'fastthread'
+        gem2.install 'rack'
+        gem2.install 'rake'
+        # These are more Rails than Passenger - Mike
+        # gem2.install 'rails'
+        # gem2.install "mysql -- --with-mysql-config='/usr/bin/mysql_config'"
+        # gem2.install 'sqlite3-ruby'
+        # gem2.install 'postgres'
+      end
       
       SYSTEM_CONFIG_FILES[:passenger] = [
 
-        {:template => 'passenger.erb',
-          :path => '/etc/apache2/conf.d/passenger',
+        {:template => 'passenger.load.erb',
+          :path => '/etc/apache2/mods-available/passenger.load',
+          :mode => 0755,
+          :owner => 'root:root'},
+          
+        {:template => 'passenger.conf.erb',
+          :path => '/etc/apache2/mods-available/passenger.conf',
           :mode => 0755,
           :owner => 'root:root'}
 
@@ -40,23 +92,11 @@ Capistrano::Configuration.instance(:must_exist).load do
       PROJECT_CONFIG_FILES[:passenger] = [
 
         { :template => 'apache_vhost.erb',
-          :path => 'apache_vhost',
+          :path => "apache_vhost",
           :mode => 0755,
           :owner => 'root:root'}
 
       ]
-
-      desc "Install passenger"
-      task :install, :roles => :passenger do
-        install_deps
-        deprec2.download_src(SRC_PACKAGES[:passenger], passenger_install_dir)
-        deprec2.install_from_src(SRC_PACKAGES[:passenger], passenger_install_dir)
-      end
-
-      # install dependencies for nginx
-      task :install_deps, :roles => :passenger do
-        apt.install( {:base => %w(apache2-mpm-prefork apache2-prefork-dev rsync)}, :stable )
-      end
        
       desc "Generate Passenger apache configs (system & project level)."
       task :config_gen do
@@ -79,26 +119,69 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
 
       desc "Push Passenger config files (system & project level) to server"
-      task :config, :roles => :passenger do
+      task :config, :roles => :app do
         config_system
         config_project  
       end
 
       desc "Push Passenger configs (system level) to server"
-      task :config_system, :roles => :passenger do
+      task :config_system, :roles => :app do
         deprec2.push_configs(:passenger, SYSTEM_CONFIG_FILES[:passenger])
+        activate_system
       end
 
       desc "Push Passenger configs (project level) to server"
-      task :config_project, :roles => :passenger do
+      task :config_project, :roles => :app do
         deprec2.push_configs(:passenger, PROJECT_CONFIG_FILES[:passenger])
         symlink_passenger_vhost
+        activate_project
       end
 
-      task :symlink_passenger_vhost, :roles => :passenger do
+      task :symlink_passenger_vhost, :roles => :app do
         sudo "ln -sf #{deploy_to}/passenger/apache_vhost #{passenger_vhost_dir}/#{application}"
       end
       
+      task :activate, :roles => :app do
+        activate_system
+        activate_project
+      end
+      
+      task :activate_system, :roles => :app do
+        sudo "a2enmod passenger"
+        top.deprec.web.reload
+      end
+      
+      task :activate_project, :roles => :app do
+        sudo "a2ensite #{application}"
+        top.deprec.web.reload
+      end
+      
+      task :deactivate do
+        puts
+        puts "******************************************************************"
+        puts
+        puts "Danger!"
+        puts
+        puts "Do you want to deactivate just this project or all Passenger"
+        puts "projects on this server? Try a more granular command:"
+        puts
+        puts "cap deprec:passenger:deactivate_system  # disable Passenger"
+        puts "cap deprec:passenger:deactivate_project # disable only this project"
+        puts
+        puts "******************************************************************"
+        puts
+      end
+      
+      task :deactivate_system, :roles => :app do
+        sudo "a2dismod passenger"
+        top.deprec.web.reload
+      end
+      
+      task :deactivate_project, :roles => :app do
+        sudo "a2dissite #{application}"
+        top.deprec.web.reload
+      end
+      
       desc "Restart Application"
       task :restart, :roles => :app do
         run "touch #{current_path}/tmp/restart.txt"
@@ -110,5 +193,42 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
       
     end
+    
+    namespace :ree do
+      
+      set :ree_version, 'ruby-enterprise-1.8.6-20090113'
+      set :ree_install_dir, "/opt/#{ree_version}"
+      set :ree_short_path, '/opt/ruby-enterprise'
+      
+      SRC_PACKAGES[:ree] = {
+        :md5sum => "e8d796a5bae0ec1029a88ba95c5d901d #{ree_version}.tar.gz",
+        :url => "http://rubyforge.org/frs/download.php/50087/#{ree_version}.tar.gz",
+        :configure => '',
+        :make => '',
+        :install => "./installer --auto /opt/#{ree_version}"
+      }
+ 
+      task :install do
+        install_deps
+        deprec2.download_src(SRC_PACKAGES[:ree], src_dir)
+        deprec2.install_from_src(SRC_PACKAGES[:ree], src_dir)
+        symlink_ree
+      end
+      
+      task :install_deps do
+        apt.install({:base => %w(libssl-dev libmysqlclient15-dev libreadline5-dev)}, :stable)
+      end
+      
+      task :symlink_ree do
+        sudo "ln -sf /opt/#{ree_version} #{ree_short_path}"
+        sudo "ln -fs #{ree_short_path}/bin/gem /usr/local/bin/gem"
+        sudo "ln -fs #{ree_short_path}/bin/irb /usr/local/bin/irb"
+        sudo "ln -fs #{ree_short_path}/bin/rake /usr/local/bin/rake"
+        sudo "ln -fs #{ree_short_path}/bin/rails /usr/local/bin/rails"
+        sudo "ln -fs #{ree_short_path}/bin/ruby /usr/local/bin/ruby"
+      end
+      
+    end
+    
   end
 end

data/lib/deprec/recipes/rails.rb

@@ -1,6 +1,10 @@
 # Copyright 2006-2008 by Mike Bailey. All rights reserved.
 Capistrano::Configuration.instance(:must_exist).load do 
 
+  set :app_user_prefix,  'app_'
+  set(:app_user) { app_user_prefix + application }
+  set :app_group_prefix,  'app_'
+  set(:app_group) { app_group_prefix + application }
   set :database_yml_in_scm, true
   set :app_symlinks, nil
   set :rails_env, 'production'
@@ -11,21 +15,27 @@ Capistrano::Configuration.instance(:must_exist).load do
   # Hook into the default capistrano deploy tasks
   before 'deploy:setup', :except => { :no_release => true } do
     top.deprec.rails.setup_user_perms
+    top.deprec.rails.create_app_user_and_group
     top.deprec.rails.setup_paths
     top.deprec.rails.setup_shared_dirs
     top.deprec.rails.install_gems_for_project
   end
 
   after 'deploy:setup', :except => { :no_release => true } do
-    top.deprec.rails.setup_servers
     top.deprec.rails.create_config_dir
+    top.deprec.rails.config_gen
+    top.deprec.rails.config
+    top.deprec.rails.activate_services
     top.deprec.rails.set_perms_on_shared_and_releases
+    top.deprec.web.reload
+    top.deprec.rails.setup_database
   end
 
   after 'deploy:symlink', :roles => :app do
     top.deprec.rails.symlink_shared_dirs
     top.deprec.rails.symlink_database_yml unless database_yml_in_scm
-    top.deprec.mongrel.set_perms_for_mongrel_dirs
+    top.deprec.rails.make_writable_by_app
+    set_owner_of_environment_rb if web_server_type.to_s == 'passenger'
   end
 
   after :deploy, :roles => :app do
@@ -35,20 +45,31 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :deprec do
     namespace :rails do
       
+      task :setup_database, :roles => :db do
+        if ! roles[:db].servers.empty? # Some apps don't use database!
+          deprec2.read_database_yml
+          top.deprec.db.create_user
+          top.deprec.db.create_database
+          top.deprec.db.grant_user_access_to_database
+        end
+      end
+      
       task :install, :roles => :app do
         install_deps
         install_gems
       end
 
       task :install_deps do
-        apt.install( {:base => %w(libmysqlclient15-dev sqlite3 libsqlite3-ruby libsqlite3-dev)}, :stable )
+        apt.install( {:base => %w(libmysqlclient15-dev sqlite3 libsqlite3-ruby libsqlite3-dev libpq-dev)}, :stable )
       end
       
       # install some required ruby gems
       task :install_gems do
         gem2.install 'sqlite3-ruby'
         gem2.install 'mysql'
+        gem2.install 'ruby-pg'
         gem2.install 'rails'
+        gem2.install 'rake'
         gem2.install 'rspec'
       end
       
@@ -56,27 +77,28 @@ Capistrano::Configuration.instance(:must_exist).load do
       Install full rails stack on a stock standard ubuntu server (7.10, 8.04)
       DESC
       task :install_stack do   
-        
-        # Ruby everywhere!
-        top.deprec.ruby.install      
-        top.deprec.rubygems.install
-        
-        top.deprec.nginx.install        
-        
-        # XXX check this out before removing - Mike
-        deprec2.for_roles('app') do
-          top.deprec.svn.install
-          top.deprec.git.install     
-          top.deprec.mongrel.install
-          top.deprec.monit.install
-          top.deprec.rails.install
+
+        if app_server_type.to_s == 'passenger' and passenger_use_ree 
+          top.deprec.ree.install
+        else
+          top.deprec.ruby.install      
+          top.deprec.rubygems.install
         end
+        top.deprec.web.install        # Uses value of web_server_type 
+        top.deprec.svn.install
+        top.deprec.git.install
+        top.deprec.app.install        # Uses value of app_server_type
+        top.deprec.monit.install
+        top.deprec.rails.install
+        top.deprec.logrotate.install  
         
-        top.deprec.logrotate.install        
-        
-        top.deprec.mysql.install
-        top.deprec.mysql.start      
-
+        # We not longer install database server as part of this task.
+        # There is too much danger that someone will wreck an existing
+        # shared database.
+        #
+        # Install database server with:
+        #
+        #   cap deprec:db:install
       end
       
       task :install_rails_stack do
@@ -84,69 +106,71 @@ Capistrano::Configuration.instance(:must_exist).load do
         install_stack
       end
       
-      task :install_gems_for_project, :roles => :app do
-          if gems_for_project
-            gems_for_project.each { |gem| gem2.install(gem) }
-          end
-      end
-
-      PROJECT_CONFIG_FILES[:nginx] = [
-      
-        {:template => 'rails_nginx_vhost.conf.erb',
-         :path => "rails_nginx_vhost.conf", 
-         :mode => 0644,
-         :owner => 'root:root'},
-           
-        {:template => 'logrotate.conf.erb',
-         :path => "logrotate.conf", 
-         :mode => 0644,
-         :owner => 'root:root'}  
-      ]
-      
       desc "Generate config files for rails app."
       task :config_gen do
-        PROJECT_CONFIG_FILES[:nginx].each do |file|
-          deprec2.render_template(:nginx, file)
-        end
-        top.deprec.mongrel.config_gen_project
+        top.deprec.web.config_gen_project
+        top.deprec.app.config_gen_project
       end
 
       desc "Push out config files for rails app."
-      task :config, :roles => [:app, :web] do
-        deprec2.push_configs(:nginx, PROJECT_CONFIG_FILES[:nginx])
-        top.deprec.mongrel.config_project
-        symlink_nginx_vhost
-        symlink_nginx_logrotate_config
+      task :config do
+        top.deprec.web.config_project
+        top.deprec.app.config_project
       end
 
-      task :symlink_nginx_vhost, :roles => :web do
-        sudo "ln -sf #{deploy_to}/nginx/rails_nginx_vhost.conf #{nginx_vhost_dir}/#{application}.conf"
+      task :create_config_dir, :roles => :app do
+        deprec2.mkdir("#{shared_path}/config", :group => group, :mode => 0775, :via => :sudo)
       end
       
-      task :symlink_nginx_logrotate_config, :roles => :web do
-        sudo "ln -sf #{deploy_to}/nginx/logrotate.conf /etc/logrotate.d/nginx-#{application}"
-      end
+      # XXX This should be restricted a bit to limit what app can write to. - Mike
+      desc "set group ownership and permissions on dirs app server needs to write to"
+      task :make_writable_by_app, :roles => :app do
+        tmp_dir = "#{deploy_to}/current/tmp"
+        shared_dir = "#{deploy_to}/shared"
+        # XXX Factor this out
+        files = ["#{mongrel_log_dir}/mongrel.log", "#{mongrel_log_dir}/#{rails_env}.log"]
 
-      task :create_config_dir, :roles => :app do
-        deprec2.mkdir("#{shared_path}/config", :group => group, :mode => 0775, :via => :sudo)
+        sudo "chgrp -R #{app_group} #{tmp_dir} #{shared_dir}"
+        sudo "chmod -R g+w #{tmp_dir} #{shared_dir}" 
+        # set owner and group of log files 
+        files.each { |file|
+          sudo "touch #{file}"
+          sudo "chown #{app_user} #{file}"   
+          sudo "chgrp #{app_group} #{file}" 
+          sudo "chmod g+w #{file}"   
+        } 
       end
       
       desc "Create deployment group and add current user to it"
       task :setup_user_perms, :roles => [:app, :web] do
         deprec2.groupadd(group)
         deprec2.add_user_to_group(user, group)
-        deprec2.groupadd(mongrel_group)
-        deprec2.add_user_to_group(user, mongrel_group)
+        deprec2.groupadd(app_group)
+        deprec2.add_user_to_group(user, app_group)
         # we've just added ourself to a group - need to teardown connection
         # so that next command uses new session where we belong in group 
         deprec2.teardown_connections
       end
       
+      desc "Create user and group for application to run as"
+      task :create_app_user_and_group, :roles => :app do
+        deprec2.groupadd(app_group) 
+        deprec2.useradd(app_user, :group => app_group, :homedir => false)
+        # Set the primary group for the user the application runs as (in case 
+        # user already existed when previous command was run)
+        sudo "usermod --gid #{app_group} #{app_user}"
+      end
+      
       task :set_perms_on_shared_and_releases, :roles => :app do
         releases = File.join(deploy_to, 'releases')
         sudo "chgrp -R #{group} #{shared_path} #{releases}"
         sudo "chmod -R g+w #{shared_path} #{releases}"
       end
+      
+      # Passenger runs Rails as the owner of this file.
+      task :set_owner_of_environment_rb, :roles => :app do
+        sudo "chown  #{app_user} #{current_path}/config/environment.rb"
+      end
 
       # Setup database server.
       task :setup_db, :roles => :db, :only => { :primary => true } do
@@ -183,12 +207,18 @@ Capistrano::Configuration.instance(:must_exist).load do
         end
       end
       
-      # desc "Symlink shared files."
-      # task :symlink_shared_files, :roles => [:app, :web] do
-      #   if shared_files
-      #     shared_files.each { |file| run "ln -nfs #{shared_path}/#{file} #{current_path}/#{file}" }
-      #   end
-      # end
+      task :install_gems_for_project, :roles => :app do
+          if gems_for_project
+            gems_for_project.each { |gem| gem2.install(gem) }
+          end
+      end
+      
+      desc "Activate web, app and monit"
+      task :activate_services do
+        top.deprec.web.activate       
+        top.deprec.app.activate
+        top.deprec.monit.activate
+      end
 
       # database.yml stuff
       #
@@ -239,21 +269,10 @@ Capistrano::Configuration.instance(:must_exist).load do
       task :symlink_database_yml, :roles => :app do
         run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml" 
       end
-
-
       
-      desc "setup and configure servers"
-      task :setup_servers do
-        top.deprec.nginx.activate       
-        top.deprec.mongrel.create_mongrel_user_and_group 
-        top.deprec.mongrel.activate
-        top.deprec.monit.activate
-        top.deprec.rails.config_gen
-        top.deprec.rails.config
-      end
     end
 
-    namespace :db do
+    namespace :database do
       
       desc "Create database"
       task :create, :roles => :db do
@@ -280,3 +299,5 @@ Capistrano::Configuration.instance(:must_exist).load do
   end
   
 end
+
+