capistrano_auto_multi_install 1.0.3 → 1.0.4

data/lib/capistrano_auto_multi_install/configure_database.rb

@@ -23,6 +23,25 @@ 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'
     log 'Errors messages reporting a missing user can be safely ignored'
@@ -64,23 +83,6 @@ DEFAULT COLLATE utf8_general_ci;'")
     create_database_yml_file
   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
-  
   private
   
   def capture_as_admin command, string_to_add=''

data/lib/capistrano_auto_multi_install/database.yml.erb

@@ -1,6 +1,6 @@
 production:
  adapter: mysql
- database: #{application}_production
- username: #{mysql_user}
- password: #{mysql_password}
+ database: "<%=application%>_production"
+ username: "<%=mysql_user%>"
+ password: "<%=mysql_password%>"
  encoding: utf8

data/lib/capistrano_auto_multi_install/mongrel.conf.erb

@@ -1,9 +1,9 @@
-port: "#{port}"
-cwd: "#{base_directory}"
+port: <%=port%> 
+cwd: "<%=base_directory}%>"
 log_file: log/mongrel
 environment: production
 address: 127.0.0.1
 pid_file: log/mongrel.pid
-servers #{number_of_instances}
+servers <%=number_of_instances%>
 docroot: public
-user: #{web_user}
+user: "<%=web_user%>"

metadata

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