obbistrano 1.0.80 → 1.0.81

data/lib/obbistrano_tasks.rb

@@ -104,17 +104,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   
   namespace :app do  
   
-    task :config_check do
-      config_setup
-      databases rescue set(:databases, ["#{application}"])
-      aliases rescue set(:aliases, []);
-    end
-  
-    task :needs_root do
-      config_check
-      puts "*** This operation needs root access - Please pass in a root password using -s root=password" if !defined? "#{root_pass}"
-      exit if !defined? "#{root_pass}"
-    end
+    
   
   
 
@@ -244,14 +234,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     # GENERAL ADMIN FOR APPLICATIONS
     # =============================================================================
     
-    desc "Restarts the Apache Server. Requires root password to access."
-    task :restart do
-      config_check
-      needs_root
-      with_user("root", "#{root_pass}") do 
-        run "/etc/rc.d/init.d/httpd restart"
-      end
-    end
+    
   
     desc "Clears the application's cache files from tmp/cache."
     task :clearcache do
@@ -278,79 +261,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
   
     
-    task :setup_user do
-      needs_root
-      set :user_to_add, "#{user}"
-      set :passwd_to_add, "#{password}"
-      with_user("root", "#{root_pass}") do 
-        run "useradd -p `openssl passwd #{passwd_to_add}` #{user_to_add}"
-        run "chmod -R 0755 /home/#{user_to_add}"
-      end
-    end
-  
-    task :setup_mysql do
-      needs_root
-      set :user_to_add, "#{user}"
-      set :passwd_to_add, "#{password}"
-      with_user("root", "#{root_pass}") do
-        "#{databases}".each do |db|
-          begin
-            run "mysql -uroot -p#{root_pass} -e \"CREATE USER '#{user_to_add}'@'localhost' IDENTIFIED BY '#{passwd_to_add}';\""
-            run "mysql -uroot -p#{root_pass} -e 'CREATE DATABASE #{db}'"
-            run "musql -uroot -p#{root_pass} -e \"GRANT ALL PRIVILEGES ON `#{db}` . * TO '#{user_to_add}'@'localhost' IDENTIFIED BY '#{passwd_to_add}';\""
-          rescue
-            logger.info "Database #{db} already exists"
-          end
-        end
-      end
     
-    end
-  
-    task :try_login do
-      config_check
-      begin
-        run "ls"
-        puts "Logged in ok"
-      rescue
-        print "==== The user does not yet exist. Would you like to create? [Y/N]"
-        line = STDIN.gets.upcase.strip
-        puts "*** Could not continue as the login does not exist" if line !="Y"
-        exit if line != "Y"
-        setup_user
-      end
-    end
-  
-    desc "Creates or gets an ssh key for the application"
-    task :ssh_key do 
-      config_check
-      begin
-        run "cat .ssh/id_rsa.pub"
-      rescue
-        run "mkdir -p .ssh/"
-        run "ssh-keygen -t rsa -f .ssh/id_rsa -N ''"
-        run "cat .ssh/id_rsa.pub"
-      end
-    end
-  
-    desc "Creates an Apache virtual host file"
-    task :vhost do
-      config_check
-      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
-        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/httpd/conf.d/#{webserver}-apache-vhost.conf"
-        end  
-      end
-      restart
-    end
     
     
   
@@ -415,9 +326,176 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :setup do
     desc "Sets up the server with a user, home directory and mysql login."
     task :default do
-      app.setup
+      server.setup
     end
   end
+  
+  namespace :server do        
+    
+    
+    desc "Sets up the server with a user, home directory and mysql login."
+    task :default do
+      "#{server_type}".setup
+    end
+
+    desc "Restarts the web server."
+    task :restart do
+      "#{server_type}".restart
+    end
+    
+    
+    ###### Private tasks for server operations #############
+    
+    task :config_check do
+      config_setup
+      databases rescue set(:databases, ["#{application}"])
+      aliases rescue set(:aliases, []);
+      server_type rescue set(:server_type, "fedora")
+    end
+  
+    task :needs_root do
+      config_check
+      puts "*** This operation needs root access - Please pass in a root password using -s root=password" if !defined? "#{root_pass}"
+      exit if !defined? "#{root_pass}"
+    end
+    
+    task :try_login do
+      config_check
+      begin
+        run "ls"
+        puts "Logged in ok"
+      rescue
+        print "==== The user does not yet exist. Would you like to create? [Y/N]"
+        line = STDIN.gets.upcase.strip
+        puts "*** Could not continue as the login does not exist" if line !="Y"
+        exit if line != "Y"
+        setup_user
+      end
+    end
+  
+    desc "Creates or gets an ssh key for the application"
+    task :ssh_key do 
+      config_check
+      begin
+        run "cat .ssh/id_rsa.pub"
+      rescue
+        run "mkdir -p .ssh/"
+        run "ssh-keygen -t rsa -f .ssh/id_rsa -N ''"
+        run "cat .ssh/id_rsa.pub"
+      end
+    end
+    
+    desc "Creates a MySQL user and database"
+    task :setup_mysql do
+      needs_root
+      set :user_to_add, "#{user}"
+      set :passwd_to_add, "#{password}"
+      with_user("root", "#{root_pass}") do
+        "#{databases}".each do |db|
+          begin
+            run "mysql -uroot -p#{root_pass} -e \"CREATE USER '#{user_to_add}'@'localhost' IDENTIFIED BY '#{passwd_to_add}';\""
+            run "mysql -uroot -p#{root_pass} -e 'CREATE DATABASE #{db}'"
+            run "musql -uroot -p#{root_pass} -e \"GRANT ALL PRIVILEGES ON `#{db}` . * TO '#{user_to_add}'@'localhost' IDENTIFIED BY '#{passwd_to_add}';\""
+          rescue
+            logger.info "Database #{db} already exists"
+          end
+        end
+      end
+    end
+    
+    
+    
+  end
+  
+  namespace :ubuntu do
+    
+    desc "Ubuntu: Sets up a user and home directory"
+    task :setup_user do
+      server.needs_root
+      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
+     
+    desc "Ubuntu: Creates Apache virtual host file"
+    task :vhost do
+      server.config_check
+      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
+        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
+      server.restart
+    end
+    
+    desc "Ubuntu: Restarts the Apache Server"
+    task :restart do
+      config_check
+      needs_root
+      with_user("root", "#{root_pass}") do 
+        run "/etc/init.d/apache2 restart"
+      end
+    end
+    
+  end
+  
+  namespace :fedora do
+
+    desc "Fedora: Sets up a user and home directory"
+    task :setup_user do
+      server.needs_root
+      set :user_to_add, "#{user}"
+      set :passwd_to_add, "#{password}"
+      with_user("root", "#{root_pass}") do 
+        run "useradd -p `openssl passwd #{passwd_to_add}` #{user_to_add}"
+        run "chmod -R 0755 /home/#{user_to_add}"
+      end
+    end
+  
+    desc "Fedora: Creates an Apache virtual host file"
+    task :vhost do
+      config_check
+      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
+        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/httpd/conf.d/#{webserver}-apache-vhost.conf"
+        end  
+      end
+      restart
+    end
+
+    desc "Fedora: Restarts the Apache Server. Requires root password to access."
+    task :restart do
+      server.config_check
+      server.needs_root
+      with_user("root", "#{root_pass}") do 
+        run "/etc/rc.d/init.d/httpd restart"
+      end
+    end
+
+  end
+  
+  
 
 end
 

data/obbistrano.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{obbistrano}
-  s.version = "1.0.80"
+  s.version = "1.0.81"
   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.80
+  version: 1.0.81
 platform: ruby
 authors: 
 - Ross Riley
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-08 00:00:00 +01:00
+date: 2009-11-06 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency