From 085b3e5183338dfdc8d3f875c4cdb876ea61d061 Mon Sep 17 00:00:00 2001 From: Jeroen Wiert Pluimers Date: Sun, 3 Mar 2019 13:41:20 +0100 Subject: [PATCH 1/2] Support `--server apache2` Fixes #srvrco/checkssl/issues/21 --- checkssl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkssl b/checkssl index caab753..4d76bb6 100755 --- a/checkssl +++ b/checkssl @@ -317,7 +317,7 @@ if [ $SERVERARG ]; then debug "getting list of domains from server" if [ "$STYPE" == "cpanel" ]; then cut -d":" -f 1 < /etc/userdomains | grep "\." >> "$LIST_OF_DOMAINS" - elif [ "$STYPE" == "ISPconfig" ]; then + elif [ "$STYPE" == "ISPconfig" ] || [ "$STYPE" == "apache2" ]; then apache2ctl -S | grep namevhost | awk '{print $4}' | sort | uniq >> "$LIST_OF_DOMAINS" else echo "unknown server type currently" From 8fa3d9dd9dcb73f5e2e7eea5d2a4e298b32a97c5 Mon Sep 17 00:00:00 2001 From: srvrco Date: Wed, 20 Mar 2019 17:03:40 +0000 Subject: [PATCH 2/2] merging in jpluimers fix for apache2 server type --- checkssl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checkssl b/checkssl index 4d76bb6..d2e4d4d 100755 --- a/checkssl +++ b/checkssl @@ -49,10 +49,11 @@ # 2017-12-09 Set LC_TIME to be able to parse english month (1.19) # 2017-12-09 Use absolute path to `date` binary (1.20) # 2018-08-28 merging in PR's for the new wildcard certs from LetsEncrypt (1.21) +# 2019-03-20 merging in jpluimers fix for apache2 server type (1.22) # --------------------------------------------------------------------------- PROGNAME=${0##*/} -VERSION="1.21" +VERSION="1.22" ORIGCMD="$0 $*" CODE_LOCATION="https://raw.githubusercontent.com/srvrco/checkssl/master/checkssl"