Merge 'em changes

This commit is contained in:
Kyle Drake 2015-01-18 00:35:47 -08:00
commit be34383627

View file

@ -31,8 +31,7 @@ Rainbows! do
stderr_path "/var/log/neocities/neocities.log" stderr_path "/var/log/neocities/neocities.log"
stdout_path "/var/log/neocities/neocities.log" stdout_path "/var/log/neocities/neocities.log"
# preload_app does not restart with code changes, so we turn it off. preload_app true
preload_app false
before_fork do |server, worker| before_fork do |server, worker|
old_pid = "/var/run/neocities/neocities.pid.oldbin" old_pid = "/var/run/neocities/neocities.pid.oldbin"