Skip to content

Commit

Permalink
Merge pull request Kong#353 from tsing/patch-1
Browse files Browse the repository at this point in the history
Fix ssl config parsing

Former-commit-id: d96703dc8049f594735a6630ddca5844b467b933
  • Loading branch information
subnetmarco committed Jun 26, 2015
2 parents 067ed2e + 220aa69 commit 517ac9b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions kong/cli/utils/utils.lua
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,10 @@ end
local function get_ssl_cert_and_key(kong_config)
local ssl_cert_path, ssl_key_path

if (kong_config.ssl_cert and not kong_config.ssl_key) or
(kong_config.ssl_key and not kong_config.ssl_cert) then
if (kong_config.ssl_cert_path and not kong_config.ssl_key_path) or
(kong_config.ssl_key_path and not kong_config.ssl_cert_path) then
logger:error_exit("Both \"ssl_cert_path\" and \"ssl_key_path\" need to be specified in the configuration, or none of them")
elseif kong_config.ssl_cert and kong_config.ssl_key then
elseif kong_config.ssl_cert_path and kong_config.ssl_key_path then
ssl_cert_path = kong_config.ssl_cert_path
ssl_key_path = kong_config.ssl_key_path
else
Expand Down

0 comments on commit 517ac9b

Please sign in to comment.