obbistrano 1.0.83 → 1.0.84

data/lib/obbistrano_tasks.rb

@@ -336,16 +336,37 @@ Capistrano::Configuration.instance(:must_exist).load do
     desc "Sets up the server with a user, home directory and mysql login."
     task :setup do
       config_check
-      try_login
-      "#{server_type}".setup
+      setup_user
+      vhost
+      setup_mysql
     end
 
     desc "Restarts the web server."
     task :restart do
-      server_type.restart
+      s_namespace = eval(server_type)
+      s_namespace.restart
+    end
+    
+    desc "Creates a new Apache VHost."
+    task :vhost do
+      config_check
+      needs_root
+      s_namespace = eval(server_type)
+      s_namespace.vhost
+      s_namespace.restart
+    end
+    
+    desc "Sets up a new user."
+    task :setup_user do
+      config_check
+      needs_root
+      try_login
+      s_namespace = eval(server_type)
+      s_namespace.setup_user
     end
     
     
+    
     ###### Private tasks for server operations #############
     
     task :config_check do
@@ -411,14 +432,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   
   namespace :ubuntu do
     
-    task :setup do
-      vhost
-      setup_user
-      host.setup_mysql
-    end
-    
     task :setup_user do
-      host.needs_root
       set :user_to_add, "#{user}"
       set :passwd_to_add, "#{password}"
       with_user("root", "#{root_pass}") do 
@@ -428,8 +442,6 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
      
     task :vhost do
-      host.config_check
-      host.needs_root
       with_user("root", "#{root_pass}") do 
         public_ip = ""
         run "ifconfig eth0 | grep inet | awk '{print $2}' | sed 's/addr://'" do |_, _, public_ip| end
@@ -443,12 +455,9 @@ Capistrano::Configuration.instance(:must_exist).load do
           put config, "/etc/apache2/sites-enabled/#{webserver}-apache-vhost.conf"
         end  
       end
-      server.restart
     end
     
     task :restart do
-      host.config_check
-      host.needs_root
       with_user("root", "#{root_pass}") do 
         run "/etc/init.d/apache2 restart"
       end
@@ -458,14 +467,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   
   namespace :fedora do
 
-    task :setup do
-      vhost
-      setup_user
-      host.setup_mysql
-    end
-
     task :setup_user do
-      host.needs_root
       set :user_to_add, "#{user}"
       set :passwd_to_add, "#{password}"
       with_user("root", "#{root_pass}") do 
@@ -475,8 +477,6 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
   
     task :vhost do
-      host.config_check
-      host.needs_root
       with_user("root", "#{root_pass}") do 
         public_ip = ""
         run "ifconfig eth0 | grep inet | awk '{print $2}' | sed 's/addr://'" do |_, _, public_ip| end
@@ -490,12 +490,9 @@ Capistrano::Configuration.instance(:must_exist).load do
           put config, "/etc/httpd/conf.d/#{webserver}-apache-vhost.conf"
         end  
       end
-      restart
     end
 
     task :restart do
-      host.config_check
-      host.needs_root
       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.83"
+  s.version = "1.0.84"
   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.83
+  version: 1.0.84
 platform: ruby
 authors: 
 - Ross Riley