obbistrano 1.0.95 → 1.0.96

data/lib/obbistrano_tasks.rb

@@ -348,8 +348,9 @@ Capistrano::Configuration.instance(:must_exist).load do
       config_check
       print "==== Which server would you like to copy #{application} to? [Full Domain Name] "
       new_server = STDIN.gets.strip
-      role :new_server, new_server
-      mirror_setup, :hosts=>new_server
+      setup_user, hosts => new_server
+      vhost, hosts => new_server
+      setup_mysql, hosts => new_server
       run "rsync -avzh . #{user}@#{new_server}: --exclude 'tmp/*'"
       "#{databases}".each do |db|
         run "mysqldump #{db} | ssh #{user}@#{new_server} mysql #{db}"
@@ -357,12 +358,6 @@ Capistrano::Configuration.instance(:must_exist).load do
       
     end
     
-    task :mirror_setup do
-      setup_user
-      vhost
-      setup_mysql
-    end
-
     
     ###### Private tasks for server operations #############
     
@@ -411,7 +406,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   
   namespace :ubuntu do
     
-    task :setup_user do
+    task :setup_user, :roles => :web do
       set :user_to_add, "#{user}"
       set :passwd_to_add, "#{password}"
       with_user("root", "#{root_pass}") do 
@@ -420,7 +415,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
     end
      
-    task :vhost do
+    task :vhost, :roles => :web do
       with_user("root", "#{root_pass}") do 
         public_ip = ""
         run "ifconfig eth0 | grep inet | awk '{print $2}' | sed 's/addr://'" do |_, _, public_ip| end
@@ -436,7 +431,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
     end
     
-    task :restart do
+    task :restart, :roles => :web do
       with_user("root", "#{root_pass}") do 
         run "/etc/init.d/apache2 restart"
       end
@@ -446,7 +441,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   
   namespace :fedora do
 
-    task :setup_user do
+    task :setup_user :roles => :web do
       set :user_to_add, "#{user}"
       set :passwd_to_add, "#{password}"
       with_user("root", "#{root_pass}") do 
@@ -455,7 +450,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
     end
   
-    task :vhost do
+    task :vhost, :roles => :web do
       with_user("root", "#{root_pass}") do 
         public_ip = ""
         run "ifconfig eth0 | grep inet | awk '{print $2}' | sed 's/addr://'" do |_, _, public_ip| end
@@ -471,7 +466,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
     end
 
-    task :restart do
+    task :restart, :roles => :web do
       with_user("root", "#{root_pass}") do 
         run "/etc/rc.d/init.d/httpd restart"
       end

data/obbistrano.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{obbistrano}
-  s.version = "1.0.95"
+  s.version = "1.0.96"
   s.authors = ["Ross Riley", "One Black Bear"]
   s.date = Time.now
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: obbistrano
 version: !ruby/object:Gem::Version 
-  version: 1.0.95
+  version: 1.0.96
 platform: ruby
 authors: 
 - Ross Riley