Rename confdir to serverconf

voxpupuli · Nov 10, 2017 · 606242c · 606242c
1 parent 72a8694
commit 606242c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/bin/puppet_webhook b/bin/puppet_webhook
@@ -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

diff --git a/config/app.yml b/config/app.yml
@@ -28,4 +28,4 @@ enable_ssl: false
 verify_ssl: false
 public_key_path: ''
 private_key_path: ''
-command_prefix: 'umask 0022;'
+command_prefix: 'umask 0022;'
diff --git a/config/server.yml b/config/server.yml
@@ -10,4 +10,4 @@ enable_ssl: false
 verify_ssl: false
 public_key_path: ''
 private_key_path: ''
-command_prefix: 'umask 0022;'
+command_prefix: 'umask 0022;'