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

evoacme: check for readability, not just presence

Browse source
This commit is contained in:
Jérémy Lecour 2017-10-13 12:28:44 +02:00 committed by Jérémy Lecour
parent 3c283d2bb4
commit 9bccbd9496
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
evoacme/files/evoacme.sh
View file

@ -55,23 +55,23 @@ sed_cert_path_for_nginx() {
x509_verify() { x509_verify() {
file="$1" file="$1"
[ -f "$file" ] || error "File ${file} not found" [ -r "$file" ] || error "File ${file} not found"
${OPENSSL_BIN} x509 -noout -modulus -in "$file" >/dev/null ${OPENSSL_BIN} x509 -noout -modulus -in "$file" >/dev/null
} }
csr_verify() { csr_verify() {
file="$1" file="$1"
[ -f "$file" ] || error "File ${file} not found" [ -r "$file" ] || error "File ${file} not found"
${OPENSSL_BIN} req -noout -modulus -in "$file" >/dev/null ${OPENSSL_BIN} req -noout -modulus -in "$file" >/dev/null
} }
x509_enddate() { x509_enddate() {
file="$1" file="$1"
[ -f "$file" ] || error "File ${file} not found" [ -r "$file" ] || error "File ${file} not found"
${OPENSSL_BIN} x509 -noout -enddate -in "$file" ${OPENSSL_BIN} x509 -noout -enddate -in "$file"
} }
main() { main() {
# Read configuration file, if it exists # Read configuration file, if it exists
[ -f /etc/default/evoacme ] && . /etc/default/evoacme [ -r /etc/default/evoacme ] && . /etc/default/evoacme
# Default value for main variables # Default value for main variables
SSL_KEY_DIR=${SSL_KEY_DIR:-"/etc/ssl/private"} SSL_KEY_DIR=${SSL_KEY_DIR:-"/etc/ssl/private"}
@ -114,7 +114,7 @@ main() {
# Hook for evoadmin-web in cluster mode : check master status # Hook for evoadmin-web in cluster mode : check master status
evoadmin_state_file="/home/${VHOST}/state" evoadmin_state_file="/home/${VHOST}/state"
[ -f "${evoadmin_state_file}" ] \ [ -r "${evoadmin_state_file}" ] \
&& grep -q "STATE=slave" "${evoadmin_state_file}" \ && grep -q "STATE=slave" "${evoadmin_state_file}" \
&& debug "We are slave of this evoadmin cluster. Quit!" \ && debug "We are slave of this evoadmin cluster. Quit!" \
&& exit 0 && exit 0