deploy-sphinx.rb in sml-rubber-1.5.5

- old
+ new

@@ -16,11 +16,11 @@
     after "rubber:install_packages", "rubber:sphinx:custom_install"
 
     task :custom_install, :roles => :sphinx do
       # install sphinx from source
       ver = "0.9.8.1"
-      rubber.run_script 'install_sphinx', <<-ENDSCRIPT
+      rubber.sudo_script 'install_sphinx', <<-ENDSCRIPT
         # check if already installed
         if [ -x /usr/local/bin/searchd ]
           then echo 'Found sphinx searchd on system'
           if /usr/local/bin/searchd --help | grep 'Sphinx #{ver}'
             then echo 'Sphinx version matches, no further steps needed'
@@ -58,28 +58,28 @@
     end
 
     desc "Do sphinx setup tasks"
     task :setup, :roles => :sphinx do
       # Setup links to sphinx config/index as they need to persist between deploys
-      run "mkdir -p #{sphinx_root} #{sphinx_root}/config #{sphinx_root}/db"
-      run "chown -R #{runner}:#{runner} #{sphinx_root}"
+      rsudo "mkdir -p #{sphinx_root} #{sphinx_root}/config #{sphinx_root}/db"
+      rsudo "chown -R #{runner}:#{runner} #{sphinx_root}"
     end
 
     desc "Setup paths for sphinx runtime"
     task :config_dir, :roles => :sphinx do
-      run "rm -rf #{current_path}/sphinx && ln -sf #{sphinx_root} #{current_path}/sphinx"
+      rsudo "rm -rf #{current_path}/sphinx"
+      rsudo "ln -sf #{sphinx_root} #{current_path}/sphinx"
     end
 
     # runs the given ultrasphinx rake tasks
     def run_sphinx task
-      cmd = "cd #{current_path} && sudo -u #{runner} RAILS_ENV=#{RUBBER_ENV} rake #{task}"
-      run cmd
+      rsudo "cd #{current_path} && RAILS_ENV=#{RUBBER_ENV} rake #{task}", :as => runner
     end
 
 
     desc "Stops sphinx searchd"
-    task :stop, :roles => :sphinx, :on_error => :continue do
-      run_sphinx 'ts:stop'
+    task :stop, :roles => :sphinx do
+      run_sphinx 'ts:stop; exit 0'
     end
 
     desc "Starts sphinx searchd"
     task :start, :roles => :sphinx do
       # rake tasks that load rails env can be slow, so