Merge pull request rubber#90 from ScotterC/master

Altered resque-web pid location.
wr0ngway · Sep 13, 2011 · e5e23cc · e5e23cc
2 parents d4d4cf5 + 4751f70
commit e5e23cc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/generators/vulcanize/templates/resque/config/rubber/deploy-resque.rb b/lib/generators/vulcanize/templates/resque/config/rubber/deploy-resque.rb
@@ -51,12 +51,12 @@
 
       desc "Starts resque web tools"
       task :start, :roles => :resque_web do
-        rsudo "RAILS_ENV=#{RUBBER_ENV} resque-web --pid-file /var/run/resque_web.pid --port #{rubber_env.resque_web_port} --no-launch #{current_path}/config/initializers/resque.rb"
+        rsudo "RAILS_ENV=#{RUBBER_ENV} resque-web --pid-file #{Rubber.root}/tmp/pids/resque_web.pid --port #{rubber_env.resque_web_port} --no-launch #{current_path}/config/initializers/resque.rb", :as => rubber_env.app_user
       end
 
       desc "Stops resque web tools"
       task :stop, :roles => :resque_web do
-        rsudo "RAILS_ENV=#{RUBBER_ENV} resque-web --pid-file /var/run/resque_web.pid --kill"
+        rsudo "RAILS_ENV=#{RUBBER_ENV} resque-web --pid-file #{Rubber.root}/tmp/pids/resque_web.pid --kill", :as => rubber_env.app_user
       end
 
       desc "Restarts resque web tools"

diff --git a/...generators/vulcanize/templates/resque/config/rubber/role/resque_web/monit-resque_web.conf b/...generators/vulcanize/templates/resque/config/rubber/role/resque_web/monit-resque_web.conf
@@ -1,7 +1,7 @@
 <%
   @path = '/etc/monit/monit.d/monit-resque_web.conf'
 
-  pidfile = "/var/run/resque_web.pid"
+  pidfile = "#{Rubber.root}/tmp/pids/resque_web.pid"
   start_program = "HOME=/root resque-web --pid-file #{pidfile} --port #{rubber_env.resque_web_port} --no-launch #{RUBBER_ROOT}/config/initializers/resque.rb"
   stop_program  = "HOME=/root resque-web --pid-file #{pidfile} --kill"
 %>