Merge branch 'master' of https://github.com/TinCanTech/easy-rsa into TinCanTech-master

This commit is contained in:
Eric F Crist 2019-06-07 08:55:45 -05:00
commit 4af5aecb49
No known key found for this signature in database
GPG Key ID: 72964219390D0D0E

View File

@ -163,7 +163,8 @@ verb_off ()
wait_sec () wait_sec ()
{ {
( sleep 4 2>/dev/null ) || { ( ping -n 1 127.0.0.1 2>/dev/null ) && ping -n 3 127.0.0.1; } delay=${1:-3}
( sleep $delay 2>/dev/null ) || { ( ping -n 1 127.0.0.1 2>/dev/null ) && ping -n $delay 127.0.0.1; }
} }
setup () setup ()
@ -370,7 +371,7 @@ build_full ()
build_san_full () build_san_full ()
{ {
newline 1 newline 1
STEP_NAME="--subject-alt-name=IP:0.0.0.0 build-server-full $REQ_name nopass" STEP_NAME="--subject-alt-name=DNS:www.example.org,IP:0.0.0.0 build-server-full $REQ_name nopass"
action action
secure_key secure_key
} }
@ -471,7 +472,7 @@ create_pki ()
REQ_name="s01" REQ_name="s01"
build_full build_full
show_cert show_cert
wait_sec wait_sec 3
renew_cert renew_cert
show_cert show_cert
revoke_cert revoke_cert
@ -480,6 +481,9 @@ create_pki ()
REQ_name="s02" REQ_name="s02"
build_san_full build_san_full
show_cert show_cert
wait_sec 3
renew_cert
show_cert
revoke_cert revoke_cert
REQ_type="serverClient" REQ_type="serverClient"
@ -492,7 +496,7 @@ create_pki ()
REQ_name="c01" REQ_name="c01"
build_full build_full
show_cert show_cert
wait_sec wait_sec 3
renew_cert renew_cert
show_cert show_cert
revoke_cert revoke_cert