diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-12 11:46:17 -0700 |
|---|---|---|
| committer | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-12 11:46:17 -0700 |
| commit | 1f438da968e1583d900903407c2e5b17648fa937 (patch) | |
| tree | 8d402af900458792a0cb516b2c903578fb592b7d /lib/puppet/application | |
| parent | e059539a0d7bfc33f80b003894a1a2d807e85851 (diff) | |
| parent | 8f907f21c05295a4e04a55e2d0b287454eea4773 (diff) | |
Merge branch '2.6.next' into 2.6.x
Diffstat (limited to 'lib/puppet/application')
| -rw-r--r-- | lib/puppet/application/agent.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb index 9f5921de1..0d67c1a88 100644 --- a/lib/puppet/application/agent.rb +++ b/lib/puppet/application/agent.rb @@ -168,8 +168,8 @@ class Puppet::Application::Agent < Puppet::Application end def setup_listen - unless FileTest.exists?(Puppet[:authconfig]) - Puppet.err "Will not start without authorization file #{Puppet[:authconfig]}" + unless FileTest.exists?(Puppet[:rest_authconfig]) + Puppet.err "Will not start without authorization file #{Puppet[:rest_authconfig]}" exit(14) end |