lib/railsmachine/recipes.rb in railsmachine-1.0.5 vs lib/railsmachine/recipes.rb in railsmachine-1.0.6

@@ -40,10 +40,13 @@
   set :apache_proxy_address, "127.0.0.1"
   set :apache_ssl_enabled, false
   set :apache_ssl_ip, nil
   set :apache_ssl_forward_all, false
  
+  # mysql defaults
+  set :mysql_admin, nil
+ 
   set :repository do
     scm = fetch(:scm)
     repos_base = "#{user}@#{domain}#{deploy_to}"
     if scm.to_s == 'subversion'
       "svn+ssh://#{repos_base}/repos/trunk"
@@ -77,11 +80,11 @@
     desc <<-DESC
     A macro task that calls setup for db, app, symlinks, and web.
     Used to configure your deployment environment in one command.
     DESC
     task :setup  do
-      sudo  "chown -R #{user}:#{user} #{deploy_to.gsub(application,'')}"
+      sudo  "chown -R #{user}:#{user} #{File.dirname(deploy_to)}"
       deploy.setup
     begin
       db.setup
     rescue
       puts "db:setup failed!"
@@ -215,10 +218,10 @@
     desc <<-DESC
     Setup source control repository.
     DESC
     task :setup, :roles => :scm  do
     begin
-      sudo  "chown -R #{user}:#{user} #{deploy_to.gsub(application,'')}"
+      sudo  "chown #{user}:#{user} #{deploy_to.gsub(application,'')}"
       localrepo.setup
     rescue
       puts "repos:setup failed!"
     end
       localrepo.import