easy-deployment 0.5.2 → 0.5.3

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog for easy-deployment
 
+## 0.5.3 (2013-09-05)
+
+Bugfixes:
+
+* `bundle_without` was previously set incorrectly in the deploy.rb template, this has been removed from the template. Recommended to remove from your deploy.rb, but low impact.
+
+Featues:
+
+* Added support for multiple platform apache/passenger in the apache tasks. (apache path can now be set)
+* Logrotate configuration is now run on each deploy. Previously was only hooked on deploy:start which may not always be run for passenger setups.
+* Removed deploy.rb template comments re 'rvm-capistrano' deploying, as we don't primarily deploy off rvm.
+* Links to further documentation on the github wiki added to the deploy.rb file
+
 ## 0.5.2 (2013-08-20)
 
 Bugfixes:

data/lib/easy/deployment/apache.rb

@@ -7,6 +7,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   end
 
   set :apachectl_bin, "apache2ctl"
+  set :apache_dir, "/etc/apache2"
 
   namespace :apache do
     desc "Configure this site, test the configuration & gracefully reload the Apache configuration"
@@ -23,12 +24,12 @@ Capistrano::Configuration.instance(:must_exist).load do
         files = capture("for f in #{apache_dir_path}/*; do echo $f; done").split("\r\n")
         files.each do |file|
           file_name = file.split(/\/([^\/]+)$/)[1]
-          run "cp -f #{file} /etc/apache2/sites-available/#{file_name}"
-          run "ln -fs /etc/apache2/sites-available/#{file_name} /etc/apache2/sites-enabled/#{file_name}"
+          run "cp -f #{file} #{apache_dir}/sites-available/#{file_name}"
+          run "ln -fs #{apache_dir}/sites-available/#{file_name} #{apache_dir}/sites-enabled/#{file_name}"
         end
       else # single apache file (to be deprecated)
-        run "cp -f #{current_path}/config/deploy/#{stage}/apache.conf /etc/apache2/sites-available/#{application}"
-        run "ln -fs /etc/apache2/sites-available/#{application} /etc/apache2/sites-enabled/#{application}"
+        run "cp -f #{current_path}/config/deploy/#{stage}/apache.conf #{apache_dir}/sites-available/#{application}"
+        run "ln -fs #{apache_dir}/sites-available/#{application} #{apache_dir}/sites-enabled/#{application}"
       end
 
       configure_mods
@@ -39,8 +40,8 @@ Capistrano::Configuration.instance(:must_exist).load do
       passenger_conf = "#{current_path}/config/deploy/#{stage}/passenger.conf"
 
       if remote_file_exists?(passenger_conf)
-        run "cp -f #{passenger_conf} /etc/apache2/mods-available/passenger.conf"
-        run "ln -fs /etc/apache2/mods-available/passenger.conf /etc/apache2/mods-enabled/passenger.conf"
+        run "cp -f #{passenger_conf} #{apache_dir}/mods-available/passenger.conf"
+        run "ln -fs #{apache_dir}/mods-available/passenger.conf #{apache_dir}/mods-enabled/passenger.conf"
       else
         puts "Passenger.conf not found, not configuring any apache mods"
       end

data/lib/easy/deployment/logrotate.rb

@@ -7,5 +7,5 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
   end
 
-  before 'deploy:start', 'logrotate:setup'
+  after 'deploy:update', 'logrotate:setup'
 end

data/lib/easy/generators/templates/deploy.rb.tt

@@ -12,7 +12,7 @@ end
 <% unless options[:disable_bugsnag] %>require "bugsnag/capistrano"<% end %>
 <% unless options[:disable_newrelic] %>require "new_relic/recipes"
 after "deploy:update", "newrelic:notice_deployment"
-<% end %><% unless options[:disable_backup] %># Backup
+<% end %><% unless options[:disable_backup] %># Backup to S3 (read more https://github.com/AbleTech/easy-deployment/wiki/Backup)
 require "easy/deployment/backup"
 require "whenever/capistrano"
 set :whenever_command, "#{fetch(:bundle_cmd, "bundle")} exec whenever"
@@ -30,27 +30,19 @@ set :deploy_via, :remote_cache
 set :git_shallow_clone, 1
 # easy-deployment sets the branch to deploy to the current local branch by default.
 
-set :bundle_without, defer { fetch(:stages) - [fetch(:stage)] } # Bundle without other stage environments
-
 set :user, "deploy"
 set :runner, "deploy"
 
-# Optional feature: apache restarts
+# Optional feature: apache restarts - read more at https://github.com/AbleTech/easy-deployment/wiki/Apache
 # require "easy/deployment/apache"
-# set :apachectl_bin, "/usr/sbin/apachectl"
+# set :apachectl_bin, "/usr/sbin/apachectl" # recommended: set the full path which requires sudo privileges
+# set :apache_dir, "/etc/apache2"           # optional to set. default value "/etc/apache2" - set this if your platform has a different path
 
-# Optional feature: configure log rotation
+# Optional feature: configure log rotation - read more at https://github.com/AbleTech/easy-deployment/wiki/Logrotate
 # require "easy/deployment/logrotate"
 
-# Optional feature: db reference data. Requires easy-reference gem
+# Optional feature: db reference data. Requires [easy_reference_data gem](https://github.com/AbleTech/easy_reference_data)
 # require "easy/deployment/dbreference"
 
 # Optional feature: capistrano performance report. Timings for slow deploys
 # require "easy/deployment/performance"
-
-
-# If deploying with RVM:
-# Add gem 'rvm' to the development group in Gemfile, and uncomment following lines
-# require "rvm/capistrano"
-# set :rvm_type, :system
-# set :rvm_ruby_string, '1.9.2-p290'

data/lib/easy-deployment/version.rb

@@ -1,5 +1,5 @@
 module Easy
   module Deployment
-    VERSION = "0.5.2"
+    VERSION = "0.5.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy-deployment
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails