Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(resty) Make Kong compatible with OpenResty 1.9.7.* #906

Merged
merged 1 commit into from
Feb 5, 2016

Conversation

thibaultcha
Copy link
Member

ssl_cert_by_lua is only supported in the form of ssl_cert_by_lua_block. This does not yet update the other directives to the newer *by_lua_block syntax.

  • Make the nginx configuration compatible with 1.9.7.2 by using ssl_certificate_by_lua_block
  • Bump OpenResty's CI version to 1.9.7.2
  • Remove caching of compiled OpenResty to avoid breaking testing between this branch and other branches of the repo still relying on an older version
  • Remove Nginx patching and ngx.ssl vendor module (not needed anymore)

@@ -100,7 +100,7 @@

######
## Name of the keyspace used by Kong. Will be created if it does not exist.
# keyspace: kong
keyspace: kong_dev
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this intentional?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I pushed this without it being ready to trigger the Travis tests, but I forgot to add the "WIP" label on the PR. It's now ready, and the issue we have is now that this is a patch introducing a breaking change because of the required change in kong.yml.

@thibaultcha thibaultcha force-pushed the chore/bump-openresty branch 7 times, most recently from fdf6db7 to 9691fa6 Compare January 27, 2016 22:01
@thibaultcha thibaultcha added the pr/ready (but hold merge) No more concerns, but do not merge yet (probably a conflict of interest with another PR or release) label Jan 27, 2016
@thibaultcha thibaultcha changed the title chore(resty) compatible with OpenResty 1.9.7.* chore(resty) Make Kong compatible with OpenResty 1.9.7.* Jan 28, 2016
@thibaultcha thibaultcha modified the milestone: 0.7.0 Jan 30, 2016
ssl_cert_by_lua is only supported in the form of ssl_cert_by_lua_block

This does not yet update the other directives to the newer *by_lua_block
syntax.
thibaultcha added a commit that referenced this pull request Feb 5, 2016
chore(resty) Make Kong compatible with OpenResty 1.9.7.*
@thibaultcha thibaultcha merged commit 4f01a95 into next Feb 5, 2016
@thibaultcha thibaultcha deleted the chore/bump-openresty branch February 5, 2016 20:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr/ready (but hold merge) No more concerns, but do not merge yet (probably a conflict of interest with another PR or release)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants