evolix/ansible-roles
22
2
Fork 2
Code Issues 61 Pull requests 18 Releases 32 Wiki Activity

evoacme: csr verification is a different function call

Browse source
This commit is contained in:
Jérémy Lecour 2017-10-12 18:20:49 +02:00 committed by Jérémy Lecour
parent 118a9759af
commit 30434a70d8
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
evoacme/files/evoacme.sh
View file

@ -50,15 +50,13 @@ sed_cert_path_for_nginx() {
}
x509_verify() {
file=$1
${OPENSSL_BIN} x509 -noout -modulus -in "${file}" >/dev/null
${OPENSSL_BIN} x509 -noout -modulus -in "$1" >/dev/null
}
csr_verify() {
${OPENSSL_BIN} req -noout -modulus -in "$1" >/dev/null
}
x509_enddate() {
file=$1
${OPENSSL_BIN} x509 -noout -enddate -in "${file}"
${OPENSSL_BIN} x509 -noout -enddate -in "$1"
}
main() {
@ -106,7 +104,7 @@ main() {
[ ! -f "${CSR_FILE}" ] && error "${CSR_FILE} absent"
[ ! -r "${CSR_FILE}" ] && error "${CSR_FILE} is not readable"
x509_verify "${CSR_FILE}" || error "${CSR_FILE} is invalid"
csr_verify "${CSR_FILE}" || error "${CSR_FILE} is invalid"
# Hook for evoadmin-web in cluster mode : check master status
evoadmin_state_file="/home/${VHOST}/state"