railsmachine 0.1.0 → 0.1.1

data/Rakefile

@@ -15,7 +15,7 @@ setup_rdoc ['README', 'LICENSE', 'COPYING', 'lib/**/*.rb', 'doc/**/*.rdoc']
 desc "Does a full compile, test run"
 task :default => [:test, :package]
 
-version="0.1.0"
+version="0.1.1"
 name="railsmachine"
 
 setup_gem(name, version) do |spec|

data/lib/railsmachine/recipes/apache.rb

@@ -18,10 +18,9 @@ Capistrano.configuration(:must_exist).load do
   set to true."
   task :configure_apache, :roles => :web do
     set_apache_conf
-    set :apache_server_name, domain unless apache_server_name
     
     server_aliases = []
-    server_aliases << "www.#{domain}"
+    server_aliases << "www.#{apache_server_name}"
     server_aliases.concat apache_server_aliases
     set :apache_server_aliases_array, server_aliases
     

data/lib/railsmachine/recipes.rb

@@ -10,6 +10,7 @@ Capistrano.configuration(:must_exist).load do
   task :setup_servers  do
     setup_db
     setup_app
+    setup_symlinks
     setup_web
   end
   
@@ -38,7 +39,7 @@ Capistrano.configuration(:must_exist).load do
   
   desc "Setup web server."
   task :setup_web, :roles => :web  do
-    set :apache_server_name, domain
+    set :apache_server_name, domain unless apache_server_name
     configure_apache
   end
   
@@ -73,6 +74,20 @@ Capistrano.configuration(:must_exist).load do
     import_svn
   end
   
+  desc "Setup public symlink directories"
+  task :setup_symlinks, :roles => [:app, :web] do
+    if app_symlinks
+      app_symlinks.each { |link| run "mkdir -p #{shared_path}/public/#{link}" }
+    end
+  end
+  
+  desc "Link up any public directories."
+  task :symlink_public, :roles => [:app, :web] do
+    if app_symlinks
+      app_symlinks.each { |link| run "ln -nfs #{shared_path}/public/#{link} #{current_path}/public/#{link}" }
+    end
+ end
+  
   desc <<-DESC
   Restart the processes on the application server by calling restart_app.
   DESC
@@ -87,18 +102,9 @@ Capistrano.configuration(:must_exist).load do
     start_app
   end
   
-  desc "Link up any directories."
-  task :after_symlink, :roles => :app do
-    if app_symlinks
-      app_symlinks.each { |link| run "ln -nfs #{shared_path}/public/#{link} #{current_path}/public/#{link}" }
-    end
- end
-  
-  desc "Setup symlink dirs"
-  task :after_setup, :roles => :app do
-    if app_symlinks
-      app_symlinks.each { |link| run "mkdir #{shared_path}/#{link}" }
-    end
+  desc "Creates additional symlinks."
+  task :after_symlink, :roles => [:app, :web] do
+    symlink_public
   end
   
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: railsmachine
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2006-06-19 00:00:00 -04:00
+  version: 0.1.1
+date: 2006-06-21 00:00:00 -04:00
 summary: The Rails Machine task library
 require_paths: 
 - lib