obbistrano 1.1.21 → 1.1.22

data/lib/obbistrano_tasks.rb

@@ -373,44 +373,9 @@ Capistrano::Configuration.instance(:must_exist).load do
     
   end
   
-  namespace :ubuntu do
-    
-    task :setup_user do
-      set :user_to_add, "#{user}"
-      set :passwd_to_add, "#{password}"
-      with_user("root", "#{root_pass}") do 
-        run "useradd -d /home/#{user_to_add} -p `openssl passwd #{passwd_to_add}` -m #{user_to_add}"
-        run "chmod -R 0755 /home/#{user_to_add}"
-      end
-    end
-     
-    task :vhost do
-      with_user("root", "#{root_pass}") do 
-        public_ip = ""
-        run "ifconfig eth0 | grep inet | awk '{print $2}' | sed 's/addr://'" do |_, _, public_ip| end
-        public_ip = public_ip.strip
-        roles[:web].servers.each do |webserver|
-          f = File.open(File.join(File.dirname(__FILE__), 'templates/apache_vhost.erb' ))
-          contents = f.read
-          f.close
-          buffer = ERB.new(contents)
-          config = buffer.result(binding())
-          put config, "/etc/apache2/sites-enabled/#{webserver}-apache-vhost.conf"
-        end  
-      end
-    end
-    
-    task :restart do
-      with_user("root", "#{root_pass}") do 
-        run "/etc/init.d/apache2 restart"
-      end
-    end
-    
-  end
-  
   namespace :fedora do
 
-    task :setup_user do
+    task :setup_user, :roles =>[:host] do
       set :user_to_add, "#{user}"
       set :passwd_to_add, "#{password}"
       with_user("root", "#{root_pass}") do 
@@ -419,7 +384,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
     end
   
-    task :vhost do
+    task :vhost, :roles =>[:host] do
       with_user("root", "#{root_pass}") do 
         public_ip = ""
         run "ifconfig eth0 | grep inet | awk '{print $2}' | sed 's/addr://'" do |_, _, public_ip| end
@@ -435,7 +400,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
     end
 
-    task :restart do
+    task :restart, :roles =>[:host] do
       with_user("root", "#{root_pass}") do 
         run "/etc/init.d/httpd restart"
       end

data/obbistrano.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{obbistrano}
-  s.version = "1.1.21"
+  s.version = "1.1.22"
   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.1.21
+  version: 1.1.22
 platform: ruby
 authors: 
 - Ross Riley