From 28ccdff6924583a31b164076ec1a8e5258c3350c Mon Sep 17 00:00:00 2001 From: Andreas Steffen Date: Sun, 12 Nov 2023 10:22:38 +0100 Subject: [PATCH] cert-enroll: Preventing some errors that might occur --- src/cert-enroll/cert-install-lighttpd | 4 ++-- src/cert-enroll/cert-install-openxpki | 2 +- src/cert-enroll/cert-install-sssd | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cert-enroll/cert-install-lighttpd b/src/cert-enroll/cert-install-lighttpd index 3e799afb2d..8bcd054f98 100644 --- a/src/cert-enroll/cert-install-lighttpd +++ b/src/cert-enroll/cert-install-lighttpd @@ -37,12 +37,12 @@ cat $HOSTKEY $HOSTCERT > /etc/lighttpd/https-cert.pem ############################################################################## # Restart the lighttpd daemon # -systemctl list-unit-files lighttpd.service | \ +test -f /usr/bin/systemctl && /usr/bin/systemctl list-unit-files lighttpd.service | \ grep -q "lighttpd.service enabled" && status=$? || status=$? if [ $status -eq 0 ] then /usr/bin/systemctl restart lighttpd.service else - /etc/init.d/lighttpd restart + /etc/init.d/lighttpd reload fi exit 0 diff --git a/src/cert-enroll/cert-install-openxpki b/src/cert-enroll/cert-install-openxpki index 02b5069489..3bed2a9f33 100644 --- a/src/cert-enroll/cert-install-openxpki +++ b/src/cert-enroll/cert-install-openxpki @@ -55,7 +55,7 @@ then cp old/$SUBCA $OPENXPKI_TLS/chain/$OLDSUBCA fi -rm $OPENXPKI_TLS/chain/*.0 +rm -f $OPENXPKI_TLS/chain/*.0 /usr/bin/openssl rehash $OPENXPKI_TLS/chain diff --git a/src/cert-enroll/cert-install-sssd b/src/cert-enroll/cert-install-sssd index 2bfb5ea219..33bb49182c 100644 --- a/src/cert-enroll/cert-install-sssd +++ b/src/cert-enroll/cert-install-sssd @@ -54,7 +54,7 @@ then cp old/$SUBCA $LDAP_TLS_CACERTDIR/$OLDSUBCA fi -rm $LDAP_TLS_CACERTDIR/*.0 +rm -f $LDAP_TLS_CACERTDIR/*.0 /usr/bin/openssl rehash $LDAP_TLS_CACERTDIR -- 2.47.2