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.

Sign up for GitHub

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

Jump to bottom

fix: move conf/cert to t/certs and disable ssl by default #2112

Merged
merged 32 commits into from
Nov 20, 2020
Merged

fix: move conf/cert to t/certs and disable ssl by default #2112

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
f8cfc85
move cert besides in Makefile
Yiyiyimu Aug 24, 2020
2d503f5
move cert besides in Makefile
Yiyiyimu Aug 24, 2020
71a3445
rm certs in Makefile
Yiyiyimu Aug 24, 2020
cf12693
merge master
Yiyiyimu Aug 24, 2020
9c5ce68
turn default ssl off
Yiyiyimu Nov 18, 2020
3d66357
fix typo
Yiyiyimu Nov 18, 2020
095fa8c
merge master
Yiyiyimu Nov 18, 2020
0400580
enable ssl for test
Yiyiyimu Nov 18, 2020
df91f35
fix test
Yiyiyimu Nov 18, 2020
f84eb6e
change crt path
Yiyiyimu Nov 18, 2020
b7a396d
1. made apisix.crt could be customizied 2. add cert/key path to 'enab…
Yiyiyimu Nov 18, 2020
b4fed44
change path for enable-ssl
Yiyiyimu Nov 18, 2020
28eff9e
check pwd
Yiyiyimu Nov 18, 2020
99626fa
move enbale_ssl path
Yiyiyimu Nov 18, 2020
31bd449
sync change in test files
Yiyiyimu Nov 18, 2020
948594f
add ca file
Yiyiyimu Nov 18, 2020
1e7a7ed
fix error
Yiyiyimu Nov 18, 2020
97417d0
fix error
Yiyiyimu Nov 18, 2020
2fa0c5e
rm ca crt
Yiyiyimu Nov 19, 2020
8daaf1e
fix typo
Yiyiyimu Nov 19, 2020
727197c
fix cli test
Yiyiyimu Nov 19, 2020
298237a
fix typo
Yiyiyimu Nov 19, 2020
8266257
use mtls certs
Yiyiyimu Nov 19, 2020
52afd00
fix typo
Yiyiyimu Nov 19, 2020
d1f5763
revert
Yiyiyimu Nov 19, 2020
6e79957
ci: fix CI fail
johzchen Nov 19, 2020
71c3a86
fix: mTLS case
johzchen Nov 19, 2020
adcf6a0
ci: fix CI fail
johzchen Nov 19, 2020
70e1158
fix: revert
johzchen Nov 19, 2020
3230611
enable ssl in one test
Yiyiyimu Nov 19, 2020
d4de547
add clearer guidance in config yaml
Yiyiyimu Nov 19, 2020
0e86abf
add guidance to set ssl cert in config yaml
Yiyiyimu Nov 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .travis/apisix_cli_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ echo "
apisix:
ssl:
enable: true
ssl_cert: '../t/certs/apisix.crt'
ssl_cert_key: '../t/certs/apisix.key'
listen_port: 8443
" > conf/config.yaml

Expand Down Expand Up @@ -97,6 +99,8 @@ apisix:
- 9082
ssl:
enable: true
ssl_cert: '../t/certs/apisix.crt'
ssl_cert_key: '../t/certs/apisix.key'
listen_port:
- 9443
- 9444
Expand Down Expand Up @@ -515,6 +519,8 @@ echo '
apisix:
ssl:
enable: true
ssl_cert: "../t/certs/apisix.crt"
ssl_cert_key: "../t/certs/apisix.key"
ssl_session_tickets: true
' > conf/config.yaml

Expand Down
2 changes: 1 addition & 1 deletion conf/config-default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ apisix:
- 127.0.0.0/24 # If we don't set any IP list, then any IP access is allowed by default.
# - "::/64"
# port_admin: 9180 # use a separate port
https_admin: true # enable HTTPS when use a separate port for Admin API.
# https_admin: true # enable HTTPS when use a separate port for Admin API.
Copy link
Member

Choose a reason for hiding this comment

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

What's the default value?

Copy link
Member Author

@Yiyiyimu Yiyiyimu Nov 19, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

nil I think

# need to also enable SSL
# Admin API will use conf/apisix_admin_api.crt and conf/apisix_admin_api.key as certificate.
admin_api_mtls: # Depends on `port_admin` and `https_admin`.
Expand Down