AppTower-ubistrano 1.0.2 → 1.1.0

data/changelog.markdown

@@ -0,0 +1,12 @@
+Version 1.1.0
+-------------
+
+* Sinatra apps deploying properly
+* PHP and Rails apps should be deploying properly
+* `cap ubuntu` flow hardened
+
+Version 1.0.3
+-------------
+
+* `cap ubuntu` tested on Ubuntu 8.04 LTS Hardy
+* App deploying not at all tested

data/lib/ubistrano/apache.rb

@@ -14,7 +14,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     namespace :virtual_host do
       desc "Create a new virtual host"
       task :create, :roles => :web do
-        upload_from_erb "/etc/apache2/sites-available/#{application}_#{stage}", binding, :name => 'virtual_host', :folder => 'ubuntu'
+        upload_from_erb "/etc/apache2/sites-available/#{application}_#{stage}", binding, :name => 'virtual_host', :folder => 'apache'
       end
       
       desc "Enable a virtual host"

data/lib/ubistrano/deploy.rb

@@ -3,10 +3,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :deploy do
     desc "Restart application"
     task :restart, :roles => :app, :except => { :no_release => true } do
-      run_each [
-        "mkdir #{current_path}/tmp",
-        "touch #{current_path}/tmp/restart.txt"
-      ]
+      run_each "touch #{current_path}/tmp/restart.txt"
     end
 
     desc "Start application"
@@ -27,25 +24,28 @@ Capistrano::Configuration.instance(:must_exist).load do
       ]
       mysql.create.db
       deploy.setup
-      deploy.update
-      apache.virtual_host.create
       case platform
+      when :php
+        deploy.update
       when :rails
         rails.config.default
+        deploy.update
         deploy.migrate
       when :sinatra
         sinatra.config.default
+        deploy.update
         sinatra.install
       end
+      apache.virtual_host.create
       deploy.start
       apache.reload
     end
   
     desc "Stop servers and destroy all files"
     task :destroy, :roles => :app do
-      deploy.stop
       sudo "rm -Rf #{deploy_to}"
       mysql.destroy.db
+      apache.virtual_host.destroy
     end
   end
   

data/lib/ubistrano/helpers.rb

@@ -113,7 +113,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   end
   
   def space(str)
-    "\n#{'=' * 90}\n#{str}"
+    "\n#{'=' * 80}\n#{str}"
   end
 
 
@@ -161,12 +161,13 @@ If not, instructions for doing it manually will be displayed."
 "Please run these manually:
   sudo aptitude update
   sudo aptitude upgrade
-  sudo aptitude build-essential"
+  sudo aptitude build-essential
+Continue?"
     when :create_keys
 "May I generate an rsa ssh key pair in your ~/.ssh folder?"
     when :create_server_keys
-"May I generate an rsa ssh key pair in the server's ~/.ssh folder?
-The public key will be displayed."
+"May I generate an rsa ssh key pair on the server?
+The public key will be displayed for adding to your GitHub account."
     when :god
 "May I install God?" 
     when :god_apache
@@ -175,7 +176,7 @@ See #{File.expand_path '../../', File.dirname(__FILE__)}/templates/ubuntu/apache
     when :god_mysql
 "Would you like God to monitor mysql?
 See #{File.expand_path '../../', File.dirname(__FILE__)}/templates/ubuntu/mysql.god.erb"
-    when :god_apache
+    when :god_sshd
 "Would you like God to monitor sshd?
 See #{File.expand_path '../../', File.dirname(__FILE__)}/templates/ubuntu/sshd.god.erb"
     when :have_keys
@@ -199,6 +200,8 @@ Reload apache?"
 "It is highly recommended you run mysql_secure_installation manually.
 See http://dev.mysql.com/doc/refman/5.1/en/mysql-secure-installation.html
 Continue?"
+    when :sinatra_install
+"Would you like to run install.rb (from your app) if it exists?"
     when :ssh_keys_create
 "Create rsa ssh key pairs locally or remotely? (default: remote)"
     when :ssh_keys_upload
@@ -215,7 +218,8 @@ Continue?"
 "May I add sudo-without-password privileges for the deploy user?
 I will have to edit /etc/sudoers."
     when :ubuntu_restart
-"Would you like to restart the server now?"
+"Its probably a good idea to restart the server now.
+OK?"
     when :ubuntu_finished
 "That's it! Glad you made it.
 

data/lib/ubistrano/sinatra.rb

@@ -3,7 +3,9 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :sinatra do
     desc "Runs install.rb if exists"
     task :install do
-      run_puts "if [ -e #{current_path}/install.rb ]; then sudo ruby #{current_path}/install.rb; fi"
+      if yes(msg(:sinatra_install))
+        run_puts "if [ -e #{current_path}/install.rb ]; then sudo ruby #{current_path}/install.rb; fi"
+      end
     end
     
     namespace :config do

data/lib/ubistrano/ssh.rb

@@ -3,16 +3,22 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :ssh do
     desc 'Generate ssh keys and upload to server'
     task :default do
-      ssh.keys.create
+      ssh.keys.create.remote
+      ssh.keys.create.local
       ssh.keys.upload
     end
     
     namespace :keys do
-      desc "Creates an rsa ssh key pair (local or remote)"
-      task :create do
-        if ask(msg(:ssh_keys_create))[0..0].downcase == 'l'
-          system('ssh-keygen -t rsa') if yes(msg(:create_keys))
-        else
+      namespace :create do
+        desc "Creates an rsa ssh key pair (local)"
+        task :local do
+          if ask(msg(:ssh_keys_create))[0..0].downcase == 'l'
+            system('ssh-keygen -t rsa') if yes(msg(:create_keys))
+          end unless yes(msg(:have_keys)) 
+        end
+        
+        desc "Creates an rsa ssh key pair (remote)"
+        task :remote do
           if yes(msg(:create_server_keys))
             pass = ask "Enter a password for this key:"
             sudo_each [
@@ -22,7 +28,7 @@ Capistrano::Configuration.instance(:must_exist).load do
             ]
             sudo_puts "tail -1 /home/#{user}/.ssh/id_rsa.pub"
           end
-        end unless yes(msg(:have_keys))
+        end
       end
 
       desc "Uploads local ssh public keys into remote authorized_keys"

data/lib/ubistrano/ubuntu.rb

@@ -4,16 +4,13 @@ Capistrano::Configuration.instance(:must_exist).load do
     desc "Set up a fresh Ubuntu server"
     task :default do
       puts space(msg(:about_templates))
-      if yes("Have you already created the user defined in deploy.rb?")
-        ssh.default
-        ubuntu.config.default
-        ubuntu.aptitude.default
-        ubuntu.install.default
-        ubuntu.restart
-        puts space(msg(:ubuntu_finished))
-      else
-        puts space(msg(:visudo))
-      end
+      puts space(msg(:visudo)) unless yes("Have you already created the user defined in deploy.rb?")
+      ssh.default
+      ubuntu.config.default
+      ubuntu.aptitude.default
+      ubuntu.install.default
+      ubuntu.restart
+      puts space(msg(:ubuntu_finished))
     end
     
     desc "Restart Ubuntu server"
@@ -23,6 +20,14 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
     end
     
+    desc "Restart Ubuntu server and wait"
+    task :restart_and_wait do
+      if yes(msg(:ubuntu_restart))
+        sudo_each 'shutdown -r now'
+        exit unless yes('Please wait a little while for your server to restart. Continue?')
+      end
+    end
+    
     namespace :aptitude do
       desc 'Run all aptitude tasks'
       task :default do
@@ -31,8 +36,9 @@ Capistrano::Configuration.instance(:must_exist).load do
           aptitude.upgrade
           aptitude.essential
         else
-          msg :aptitude_instructions
+          exit unless yes(msg(:aptitude_instructions))
         end
+        ubuntu.restart_and_wait
       end
       
       desc 'Aptitude update'
@@ -118,7 +124,8 @@ Capistrano::Configuration.instance(:must_exist).load do
         if yes("May I install Apache?")
           sudo_puts [
             'aptitude install apache2 apache2-mpm-prefork apache2-utils apache2.2-common libapr1 libaprutil1 ssl-cert -q -y',
-            'a2enmod rewrite'
+            'a2enmod rewrite',
+            'a2dissite default'
           ]
         end
       end
@@ -138,7 +145,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         if yes("May I install MySQL?")
           sudo_puts 'aptitude install mysql-client-5.0 mysql-common mysql-server mysql-server-5.0 libmysqlclient15-dev libmysqlclient15off -q -y'
           ROOT.mysql.create.user
-          yes msg(:secure_mysql)
+          exit unless yes(msg(:secure_mysql))
         end
       end
       
@@ -151,7 +158,7 @@ Capistrano::Configuration.instance(:must_exist).load do
             "cd #{bin} && sudo chmod 0700 mysqltuner.pl",
             "cd #{bin} && sudo mv mysqltuner.pl mysqltuner"
           ]
-          yes msg(:mysqltuner_instructions)
+          exit unless yes(msg(:mysqltuner_instructions))
         end
       end
       
@@ -193,12 +200,12 @@ Capistrano::Configuration.instance(:must_exist).load do
       
       desc 'Install Ruby'
       task :ruby, :roles => :app do
-        install_source(:ruby) do |path|
-          sudo_puts [
-            "aptitude install libopenssl-ruby -q -y",
-            make_install(path)
-          ]
-        end if yes("May I install Ruby?")
+        if yes("May I install Ruby?")
+          sudo_puts "aptitude install libopenssl-ruby -q -y"
+          install_source(:ruby) do |path|
+            sudo_puts make_install(path)
+          end
+        end
       end
       
       desc 'Install RubyGems'
@@ -235,7 +242,7 @@ Capistrano::Configuration.instance(:must_exist).load do
           upload_from_erb('/usr/local/etc/god/sshd.god',   binding, :folder => 'ubuntu') if yes(msg(:god_sshd))
           sudo_puts [
             'update-rc.d god defaults',
-            './etc/init.d/god start'
+            '/etc/init.d/god start'
           ]
         end
       end

data/lib/ubistrano.rb

@@ -5,19 +5,42 @@ Dir["#{File.dirname(__FILE__)}/ubistrano/*.rb"].each { |f| require f }
 
 Capistrano::Configuration.instance(:must_exist).load do
   
-  # Reference ROOT when namespaces clash
-  ROOT = self
+  # Default capistrano/ubistrano values
+  set :ubistrano, {
+    :base_dir         => '/var/www',
+    :db_user          => 'app',
+    :db_pass          => '',
+    :deploy_via       => :remote_cache,
+    :domain           => [],
+    :platform         => :rails,
+    :plugins          => {},
+    :port             => 22,
+    :repository_cache => 'git_cache',
+    :scm              => :git,
+    :stage            => :production,
+    :use_sudo         => false,
+    :user             => 'deploy',
+    :versions         => {}
+  }.merge(ubistrano)
+  
+  # Default plugins
+  ubistrano[:plugins] = {
+    :app_helpers     => false,
+    :asset_packager  => false,
+    :attachment_fu   => false,
+    :rails_widget    => false,
+    :thinking_sphinx => false
+  }.merge(ubistrano[:plugins])
   
-  # Default package versions
-  ubistrano[:versions] ||= {}
-  ubistrano[:versions].merge!(
+  # Default versions
+  ubistrano[:versions] = {
     :git            => '1.6.0.4',
     :mysecureshell  => '1.1',
     :rails          => '2.2.2',
     :ruby           => '1.8.7-p72',
     :rubygems       => '1.3.1',
     :sphinx         => '0.9.8.1'
-  )
+  }.merge(ubistrano[:versions])
   
   # Merge ubistrano hash with capistrano
   ubistrano.each do |key, value|
@@ -26,46 +49,30 @@ Capistrano::Configuration.instance(:must_exist).load do
       set(key, value)
   end
   
-  # Set default capistrano values
-  set :db_user,   fetch(:db_user,   'app')
-  set :db_pass,   fetch(:db_pass,   '')
-  set :platform,  fetch(:platform,  :rails)
-  set :port,      fetch(:port,      22)
-  set :stage,     fetch(:stage,     :production)
-  set :use_sudo,  fetch(:use_sudo,  false)
-  set :user,      fetch(:user,      'deploy')
-  set :sources,   fetch(:sources,   {
+  # Default sources
+  set :sources, {
     :git           => "http://kernel.org/pub/software/scm/git/git-#{versions_git}.tar.gz",
     :mysecureshell => "http://internap.dl.sourceforge.net/sourceforge/mysecureshell/MySecureShell-#{versions_mysecureshell}_source.tgz",
     :mysqltuner    => "http://mysqltuner.com/mysqltuner.pl",
     :ruby          => "ftp://ftp.ruby-lang.org/pub/ruby/#{versions_ruby.split('.')[0..1].join('.')}/ruby-#{versions_ruby}.tar.gz",
     :rubygems      => "http://rubyforge.org/frs/download.php/45905/rubygems-#{versions_rubygems}.tgz",
     :sphinx        => "http://www.sphinxsearch.com/downloads/sphinx-#{versions_sphinx}.tar.gz"
-  })
+  }.merge(fetch(:sources, {}))
   
-  # Rails plugins
-  set :app_helpers,     fetch(:app_helpers,     false)
-  set :rails_widget,    fetch(:rails_widget,    false)
-  set :ultrasphinx,     fetch(:ultrasphinx,     false)
-  set :thinking_sphinx, fetch(:thinking_sphinx, false)
-  set :attachment_fu,   fetch(:attachment_fu,   false)
-  set :asset_packager,  fetch(:asset_packager,  false)
-  after('deploy:update_code', 'rails:config:app_helpers')     if app_helpers
-  after('deploy:update_code', 'rails:config:asset_packager')  if asset_packager
-  after('deploy:update_code', 'rails:config:attachment_fu')   if attachment_fu
-  after('deploy:update_code', 'rails:config:rails_widget')    if rails_widget
-  after('deploy:update_code', 'rails:config:ultrasphinx')     if ultrasphinx
-  after('deploy:update_code', 'rails:config:thinking_sphinx') if thinking_sphinx
-    
-  # Git by default
-  set :scm,              :git
-  set :deploy_via,       :remote_cache
-  set :repository_cache, 'git_cache'
-  ssh_options[:paranoid] = false
-
   # Events
-  on :before, 'setup_stage', :except => [ :staging, :testing ]  # Executed before every task
-  after('deploy:update_code', 'rails:config:to_app'  ) if platform == :rails
-  after('deploy:update_code', 'sinatra:config:to_app') if platform == :sinatra
+  on :before, 'setup_stage', :except => [ :staging, :testing ] # Executed before every task
+  after('deploy:update_code', 'rails:config:to_app'  )        if platform == :rails
+  after('deploy:update_code', 'sinatra:config:to_app')        if platform == :sinatra
+  after('deploy:update_code', 'rails:config:app_helpers')     if plugins_app_helpers
+  after('deploy:update_code', 'rails:config:asset_packager')  if plugins_asset_packager
+  after('deploy:update_code', 'rails:config:attachment_fu')   if plugins_attachment_fu
+  after('deploy:update_code', 'rails:config:rails_widget')    if plugins_rails_widget
+  after('deploy:update_code', 'rails:config:thinking_sphinx') if plugins_thinking_sphinx
+  
+  # Other options
+  ssh_options[:paranoid] = false
+  
+  # Reference ROOT when namespaces clash
+  ROOT = self
   
 end

data/templates/apache/virtual_host.erb

@@ -1,8 +1,7 @@
 <VirtualHost *:80>
-
+<% unless domain.empty? %>
   ServerName  <%= domain.first %>
   ServerAlias <%= domain[1..-1].join ' ' %>
-
+<% end %>
   DocumentRoot <%= deploy_to %>/current/public
-
 </VirtualHost>

data/templates/sinatra/config.ru.erb

@@ -1,10 +1,19 @@
 require 'sinatra'
 require 'rubygems'
- 
+
 Sinatra::Application.default_options.merge!(
   :run => false,
-  :env => :production
+  :env => :production,
+  :raise_errors => true,
+  :app_file => 'app.rb',
+  :root => '<%= deploy_to %>/current',
+  :views => '<%= deploy_to %>/current/views',
+  :public => '<%= deploy_to %>/current/public'
 )
- 
-require 'app.rb'
+
+log = File.new('<%= deploy_to %>/shared/log/sinatra.log', 'a')
+STDOUT.reopen(log)
+STDERR.reopen(log)
+
+require 'app'
 run Sinatra.application

data/ubistrano.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name    = 'ubistrano'
-  s.version = '1.0.2'
-  s.date    = '2008-12-13'
+  s.version = '1.1.0'
+  s.date    = '2008-12-14'
   
   s.summary     = "Provision and deploy to an Ubuntu/God/Apache/Passenger stack using Capistrano"
   s.description = "Provision and deploy to an Ubuntu/God/Apache/Passenger stack using Capistrano"
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
     MIT-LICENSE
     README.markdown
     Rakefile
-    changelog.rdoc
+    changelog.markdown
     example/deploy.rb
     lib/ubistrano.rb
     lib/ubistrano/apache.rb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: AppTower-ubistrano
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - AppTower
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-13 00:00:00 -08:00
+date: 2008-12-14 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -25,7 +25,7 @@ files:
 - MIT-LICENSE
 - README.markdown
 - Rakefile
-- changelog.rdoc
+- changelog.markdown
 - example/deploy.rb
 - lib/ubistrano.rb
 - lib/ubistrano/apache.rb

data/changelog.rdoc

@@ -1,25 +0,0 @@
-
-Version 2.0.0
-  * Tested on Ubuntu 8.04 LTS Hardy
-  * Deploys PHP, Rails, and Sinatra apps
-  * Redux version with new stack
-  * Apache
-  * Git
-  * God
-  * MySQL
-  * Passenger (mod_rails)
-  * Rails
-  * Ruby Enterprise Edition
-  
-Version 1.1.0
-  * Tested on Debian Etch
-  * Git
-  * Nginx
-  * Mongrel cluster
-  * Monit
-  * MySQL
-  * PHP (Nginx w/ spawn-fcgi)
-  * Rails
-  * Ruby
-  * RubyGems
-  * Sphinx