Skip to content
This repository has been archived by the owner on Jan 29, 2022. It is now read-only.

Commit

Permalink
Rename confdir to serverconf
Browse files Browse the repository at this point in the history
  • Loading branch information
David Hollinger committed Nov 10, 2017
1 parent 72a8694 commit b2437ec
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions bin/puppet_webhook
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ require 'webrick'
require 'webrick/https'
require 'puppet_webhook'

confdir = File.join(__dir__, '..', 'config', 'server.yml')
server_conf = File.join(__dir__, '..', 'config', 'server.yml')

if File.exist?('/etc/puppet-webhook/server.yml')
config_file '/etc/puppet-webhook/server.yml'
elsif File.exist?(confdir)
config_file confdir
elsif File.exist?(server_conf)
config_file server_conf
else
raise "Can't find server.yml. No such file or directory\n"
end
Expand Down

0 comments on commit b2437ec

Please sign in to comment.