From 551789f8619b567333bbf41020323f4e1624841c Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 4 Mar 2009 11:11:44 -0800 Subject: Remove "directory" config option Unicorn will always continue to run in the directory it started in, it does not chdir to "/". Since the default start_ctx[:cwd] is symlink-aware, this should not be a problem for Capistrano-deployed applications. --- bin/unicorn | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'bin') diff --git a/bin/unicorn b/bin/unicorn index 3b467c9..d421f18 100755 --- a/bin/unicorn +++ b/bin/unicorn @@ -71,10 +71,6 @@ opts = OptionParser.new("", 24, ' ') do |opts| listeners << address end - opts.on("-C", "--directory PATH", "run in this directory") do |d| - options[:directory] = d - end - opts.on("-c", "--config-file FILE", "Unicorn-specific config file") do |f| options[:config_file] = File.expand_path(f) end @@ -174,11 +170,10 @@ if daemonize # 0000 and potentially exposing sensitive log data can be bad # policy. # * Don't bother to chdir here since Unicorn is designed to - # run inside APP_ROOT (or whatever the "directory" directive - # specifies). Unicorn will also re-chdir() to the directory - # it was started in when being re-executed to pickup code - # changes if the original deployment directory is a symlink - # or otherwise got replaced. + # run inside APP_ROOT. Unicorn will also re-chdir() to + # the directory it was started in when being re-executed + # to pickup code changes if the original deployment directory + # is a symlink or otherwise got replaced. end Unicorn.run(app, options) -- cgit v1.2.3-24-ge0c7