From 24bbf1df3369e90ba66b37f8389d2e42bc777d26 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Tue, 15 Sep 2020 13:32:00 -0400 Subject: eliminate duplication --- selfpublish.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/selfpublish.sh b/selfpublish.sh index ffc7ad0..c97163f 100644 --- a/selfpublish.sh +++ b/selfpublish.sh @@ -537,17 +537,18 @@ case "$DOMAIN" in exit 1 ;; esac -if ! check_tls "$DOMAIN" || force -then - install_apache_vhost - configure_apache_vhost +check_tls "$DOMAIN" +tls_result=$? +install_apache_vhost +configure_apache_vhost + +if [ $tls_result != 0 ] || force +then systemctl restart apache2 wait_for_certificate_issuance "$DOMAIN" systemctl reload apache2 || systemctl restart apache2 else - install_apache_vhost - configure_apache_vhost systemctl reload apache2 || systemctl restart apache2 fi -- cgit v1.2.3