obbistrano 1.0.84 → 1.0.85

data/lib/obbistrano_tasks.rb

@@ -248,23 +248,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   
     
   
-    # =============================================================================
-    # USER AND APPLICATION SETUP AND INITIALISATION
-    # =============================================================================
-  
-    task :setup do
-      config_check
-      try_login
-      setup_mysql
-      vhost
-      ssh_key
-    end
-  
-    
-    
-    
-    
-  
+
     # =============================================================================
     # +MIGRATING+ APPLICATIONS
     # =============================================================================
@@ -365,7 +349,37 @@ Capistrano::Configuration.instance(:must_exist).load do
       s_namespace.setup_user
     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
+    
+
     
     ###### Private tasks for server operations #############
     
@@ -373,7 +387,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       config_setup
       databases rescue set(:databases, ["#{application}"])
       aliases rescue set(:aliases, []);
-      server_type rescue set(:server_type, "fedora")
+      detect_os
     end
   
     task :needs_root do
@@ -396,38 +410,14 @@ Capistrano::Configuration.instance(:must_exist).load do
       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}"
+    task :detect_os do
       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
+        if run "cat /etc/fedora_release" then server_type="fedora"
+        if run "cat /etc/debian_version" then server_type="ubuntu"
       end
+     
     end
     
-    
-    
   end
   
   namespace :ubuntu do

data/obbistrano.gemspec

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