easy-deployment 0.3.5 → 0.4.0

data/lib/easy-deployment/version.rb

@@ -1,5 +1,5 @@
 module Easy
   module Deployment
-    VERSION = "0.3.5"
+    VERSION = "0.4.0"
   end
 end

data/lib/easy/deployment/apache.rb

@@ -2,6 +2,10 @@
 # To load this Capistrano configuration, require 'easy/deployment/apache' from deploy.rb
 
 Capistrano::Configuration.instance(:must_exist).load do
+  def remote_file_exists?(full_path)
+    'true' ==  capture("if [ -e #{full_path} ]; then echo 'true'; fi").strip
+  end
+
   namespace :apache do
     desc "Configure this site, test the configuration & gracefully reload the Apache configuration"
     task :configure_and_reload, :roles => :web, :except => { :no_release => true } do
@@ -10,10 +14,34 @@ Capistrano::Configuration.instance(:must_exist).load do
       graceful
     end
 
-    desc "Configure this site"
+    desc "Configure this site (with files from config/deploy/apache/* or config/deploy/apache.conf)"
     task :configure, :roles => :web, :except => { :no_release => true } do
-      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}"
+      apache_dir_path = "#{current_path}/config/deploy/#{stage}/apache"
+      if remote_file_exists?(apache_dir_path) # multiple apache files
+        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}"
+        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}"
+      end
+
+      configure_mods
+    end
+
+    desc "Configure apache mods (currently only supports passenger.conf)"
+    task :configure_mods, :roles => :web, :except => { :no_release => true } 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"
+      else
+        puts "Passenger.conf not found, not configuring any apache mods"
+      end
     end
 
     [:stop, :start, :restart, :graceful, :configtest].each do |action|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy-deployment
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-04 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -161,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -717007355064046972
+      hash: -1607441338251001617
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -717007355064046972
+      hash: -1607441338251001617
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24