diff options
| author | Adam Jacob <adam@opscode.com> | 2010-03-17 17:19:52 -0700 |
|---|---|---|
| committer | Adam Jacob <adam@opscode.com> | 2010-03-17 17:19:52 -0700 |
| commit | 73e994086a037e642481d24ab0bfbfbc01de3ba6 (patch) | |
| tree | a6d3d328eeb50b8851f92e541c626464345f576e /chef-server | |
| parent | ae9be74a4979fe9ac2b221157492bf3c7b7a9724 (diff) | |
| parent | 84aaa6b391dba6bc7b96ae4c3c8dec6ef1cf1774 (diff) | |
| download | chef-73e994086a037e642481d24ab0bfbfbc01de3ba6.tar.gz | |
Merge branch 'CHEF-1015' of git://github.com/stormsilver/chef into stormsilver/CHEF-1015
Diffstat (limited to 'chef-server')
| -rwxr-xr-x | chef-server/bin/chef-server | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chef-server/bin/chef-server b/chef-server/bin/chef-server index 0bbc07da19..1ec6637036 100755 --- a/chef-server/bin/chef-server +++ b/chef-server/bin/chef-server @@ -56,6 +56,14 @@ end ARGV.push *[ "-I", File.join(__DIR__, "config", "init.rb") ] ARGV.push *[ "-m", __DIR__] +# attempt to find the user and group that this process will become. Fixes CHEF-1015 +if (index = ARGV.index("-u")) + Chef::Config[:signing_ca_user] = ARGV[index+1] +end +if (index = ARGV.index("-G")) + Chef::Config[:signing_ca_group] = ARGV[index+1] +end + if index = ARGV.index("-C") config = ARGV[index+1] ARGV.delete("-C") |