winton-ubistrano 1.2.3 → 1.2.4

data/README.markdown

@@ -41,8 +41,10 @@ Getting started
 
 ### Ubify your project
 
-  cd your\_project
-	ubify .
+<pre>
+cd your_project
+ubify .
+</pre>
 
 * Runs <code>capify</code>
 * Creates <code>config/deploy.example.rb</code>
@@ -64,7 +66,9 @@ set :ubistrano, {
   },
 
   :mysql => {
-    :password => ''
+    :root_password => '',
+    :app_password  => ''
+    # Ubistrano creates a mysql user for each app
   },
 
   :production => {
@@ -84,7 +88,7 @@ require 'ubistrano'
 
 Ubistrano uses the same Capistrano options you've come to love, but provides defaults and a few extra options as well.
 
-Edit deploy.rb to the best of your ability. If setting up an EC2 instance, be sure to provide your AWS keys. Your IP address will be provided later.
+Edit deploy.rb to the best of your ability. If setting up an EC2 instance, be sure to provide your AWS keys. Your IP address will be provided later. Provide passwords even if they haven't been created yet.
 
 Feel free to move any options into or out of the stage groups.
 
@@ -93,7 +97,9 @@ Create your EC2 instance
 
 ### From your app directory
 
-  cap ec2
+<pre>
+cap ec2
+</pre>
 
 ### Example output
 
@@ -107,7 +113,9 @@ Set up your Ubuntu Hardy server
 
 ### From your app directory
 
-  cap ubuntu
+<pre>
+cap ubuntu
+</pre>
 
 ### Example output
 

data/lib/ubistrano/deploy.rb

@@ -39,6 +39,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       apache.virtual_host.create
       deploy.start
       apache.reload
+      puts space(msg(:logrotate_suggest))
     end
   
     desc "Stop servers and destroy all files"

data/lib/ubistrano/helpers.rb

@@ -209,6 +209,9 @@ See #{File.expand_path '../../', File.dirname(__FILE__)}/templates/ubuntu/iptabl
     when :logrotate
 "May I add a logrotate entry for this application?
 See #{File.expand_path '../../', File.dirname(__FILE__)}/templates/log/rotate.conf.erb"
+    when :logrotate_suggest
+"All finished! Run `cap log:rotate` to add log rotating.
+"
     when :mysqltuner
 "Would you like to install MySQLTuner and receive instructions for running it?"
     when :mysqltuner_instructions

data/lib/ubistrano/log.rb

@@ -3,7 +3,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :log do
     desc "Add logrotate entry for this application"
     task :rotate, :roles => :app do
-      if yes(msg(:iptables))
+      if yes(msg(:logrotate))
         upload_from_erb '/etc/rotate.conf', binding, :folder => 'log'
         sudo_each [
           'cp -f /etc/logrotate.conf /etc/logrotate2.conf',

data/lib/ubistrano/mysql.rb

@@ -16,7 +16,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       desc "Create database user"
       task :user, :roles => :db do
         mysql_run [
-          "CREATE USER '#{application}'@'localhost' IDENTIFIED BY '#{mysql_password}'",
+          "CREATE USER '#{application}'@'localhost' IDENTIFIED BY '#{mysql_app_password}'",
           "GRANT ALL PRIVILEGES ON #{db_table}.* TO '#{application}'@'localhost'"
         ]
       end
@@ -57,7 +57,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       
       desc "Restore remote database from backup"
       task :restore, :roles => :db do
-        run_each "bunzip2 < #{shared_path}/db_backups/#{backup_name}.bz2 | mysql -u #{application} --password=#{mysql_password} #{db_table}"
+        run_each "bunzip2 < #{shared_path}/db_backups/#{backup_name}.bz2 | mysql -u #{application} --password=#{mysql_app_password} #{db_table}"
       end
       
       desc "Backup database to local"
@@ -71,7 +71,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       task :to_server, :roles => :db do
         run_each [
           "mkdir -p #{shared_path}/db_backups",
-          "mysqldump --add-drop-table -u #{application} -p#{mysql_password} #{db_table}_production | bzip2 -c > #{shared_path}/db_backups/#{backup_name}.bz2"
+          "mysqldump --add-drop-table -u #{application} -p#{mysql_app_password} #{db_table}_production | bzip2 -c > #{shared_path}/db_backups/#{backup_name}.bz2"
         ]
       end
       

data/lib/ubistrano/sinatra.rb

@@ -15,6 +15,20 @@ Capistrano::Configuration.instance(:must_exist).load do
         upload_from_erb "#{shared_path}/config/config.ru", binding, :folder => 'sinatra'
       end
       
+      desc "Creates database.yml in the shared config"
+      task :database, :roles => :app do
+        run "mkdir -p #{shared_path}/config"
+        Dir[File.expand_path('../../templates/rails/*', File.dirname(__FILE__))].each do |f|
+          upload_from_erb "#{shared_path}/config/#{File.basename(f, '.erb')}", binding, :folder => 'rails'
+        end
+      end
+      
+      desc "Creates config.ru in shared config"
+      task :rack, :roles => :app do
+        run "mkdir -p #{shared_path}/config"
+        upload_from_erb "#{shared_path}/config/config.ru", binding, :folder => 'sinatra'
+      end
+      
       desc "Copies files in the shared config folder into our app"
       task :to_app, :roles => :app do
         run "cp -Rf #{shared_path}/config/* #{release_path}"

data/templates/rails/database.yml.erb

@@ -1,8 +1,8 @@
 development: &defaults
   adapter: mysql
   database: <%= db_table %>
-  username: <%= user %>
-  password: <%= mysql_password %>
+  username: <%= application %>
+  password: <%= mysql_app_password %>
   host: localhost
   socket: /var/run/mysqld/mysqld.sock
 

data/templates/sinatra/config.ru.erb

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

data/ubistrano.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = 'ubistrano'
-  s.version = '1.2.3'
+  s.version = '1.2.4'
   s.date    = '2008-02-22'
   
   s.summary     = "Provision and deploy to an Ubuntu/God/Apache/Passenger stack using Capistrano"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: winton-ubistrano
 version: !ruby/object:Gem::Version 
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors: 
 - Winton Welsh