You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by we...@apache.org on 2020/11/20 03:10:22 UTC
[apisix] branch master updated (a0c7d62 -> 36162e3)
This is an automated email from the ASF dual-hosted git repository.
wenming pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git.
from a0c7d62 chore(doc): add aws doc (#2567)
add 36162e3 fix: move `conf/cert` to `t/certs` and disable ssl by default (#2112)
No new revisions were added by this update.
Summary of changes:
.travis/apisix_cli_test.sh | 23 +++++++++
.travis/common.sh | 13 ++++++
.travis/linux_apisix_current_luarocks_runner.sh | 1 +
.travis/linux_openresty_runner.sh | 1 +
Makefile | 1 -
apisix/cli/ngx_tpl.lua | 20 ++++----
bin/apisix | 13 ++++++
conf/config-default.yaml | 5 +-
t/APISIX.pm | 12 ++---
t/admin/ssl.t | 62 ++++++++++++-------------
{conf/cert => t/certs}/apisix.crt | 0
{conf/cert => t/certs}/apisix.key | 0
{conf/cert => t/certs}/apisix_admin_ssl.crt | 0
{conf/cert => t/certs}/apisix_admin_ssl.key | 0
{conf/cert => t/certs}/apisix_ecc.crt | 0
{conf/cert => t/certs}/apisix_ecc.key | 0
{conf/cert => t/certs}/openssl-test2.conf | 0
{conf/cert => t/certs}/openssl.conf | 0
{conf/cert => t/certs}/test2.crt | 0
{conf/cert => t/certs}/test2.key | 0
t/plugin/redirect.t | 4 +-
t/router/multi-ssl-certs.t | 12 ++---
t/router/radixtree-sni.t | 40 ++++++++--------
23 files changed, 129 insertions(+), 78 deletions(-)
rename {conf/cert => t/certs}/apisix.crt (100%)
rename {conf/cert => t/certs}/apisix.key (100%)
rename {conf/cert => t/certs}/apisix_admin_ssl.crt (100%)
rename {conf/cert => t/certs}/apisix_admin_ssl.key (100%)
rename {conf/cert => t/certs}/apisix_ecc.crt (100%)
rename {conf/cert => t/certs}/apisix_ecc.key (100%)
rename {conf/cert => t/certs}/openssl-test2.conf (100%)
rename {conf/cert => t/certs}/openssl.conf (100%)
rename {conf/cert => t/certs}/test2.crt (100%)
rename {conf/cert => t/certs}/test2.key (100%)