capistrano_auto_multi_install 1.0.4 → 1.0.6

data/lib/capistrano_auto_multi_install/configure_database.rb

@@ -23,24 +23,6 @@ DEFAULT COLLATE utf8_general_ci;'")
     log "Database done"
   end
   
-  def create_database_yml_file
-    
-    mysql_password = fetch(:mysql_user_password)
-    mysql_user =  fetch(:mysql_user)
-    
-    conf = ERB.new(File.read(File.dirname(__FILE__)+"/database.yml.erb")).result(binding)
-    run_with_power "mkdir -p #{fetch(:shared_path)}/db", fetch(:runner)
-    run_with_power "mkdir -p #{fetch(:shared_path)}/config", fetch(:runner)
-    put_with_power conf, "#{fetch(:shared_path)}/config/database.yml", fetch(:runner)
-    
-    syslink
-  end
-  
-  def syslink
-    run_with_power "ln -nfs #{fetch(:shared_path)}/config/database.yml #{fetch(:current_path)}/config/database.yml", fetch(:runner)
-  end
-  
-  
   
   def check_or_create_user
     log 'Checking if '+fetch(:mysql_user)+' has already been created and granted correctly'
@@ -51,7 +33,7 @@ DEFAULT COLLATE utf8_general_ci;'")
     ok = true
     
     required_grants = ["SELECT","INSERT","UPDATE","DELETE","CREATE","DROP", "INDEX", "LOCK TABLES", "ALTER", "CREATE VIEW"]
-    if grants == "" # User is not present
+    if grants =~ /ERROR/ # User is not present
       log 'User not present, creating him'
       ok = false
       # now let's create him
@@ -80,7 +62,21 @@ DEFAULT COLLATE utf8_general_ci;'")
     log "Alright, now database and user are correctly set up"
     
     
-    create_database_yml_file
+    
+    # Create database.yml
+    mysql_password = fetch(:mysql_user_password)
+    mysql_user =  fetch(:mysql_user)
+    application = fetch(:application)
+    
+    conf = ERB.new(File.read(File.dirname(__FILE__)+"/database.yml.erb")).result(binding)
+    run_with_power "mkdir -p #{fetch(:shared_path)}/db", fetch(:runner)
+    run_with_power "mkdir -p #{fetch(:shared_path)}/config", fetch(:runner)
+    put_with_power conf, "#{fetch(:shared_path)}/config/database.yml", fetch(:runner)
+    
+    
+    # syslinks it
+    
+    run_with_power "ln -nfs #{fetch(:shared_path)}/config/database.yml #{fetch(:current_path)}/config/database.yml", fetch(:runner)
   end
   
   private

data/lib/capistrano_auto_multi_install/server.rb

@@ -13,7 +13,7 @@ class CapistranoAutoMultiInstall::Passenger < CapistranoAutoMultiInstall::Server
   
   def generate_conf_files
     # Intanciate some locals which will be used in erb file
-    document_root = fetch(:deploy_to)+'/public'
+    document_root = fetch(:deploy_to)+'/current/public'
     server_name = name
     passenger_tmp = tmp
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano_auto_multi_install
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors: 
 - Stefano Grioni