Raphael Schneeberger 7 лет назад
Родитель
Сommit
2006c7ab87
1 измененных файлов с 12 добавлено и 3 удалено
  1. 12 3
      bin/v-list-web-domain-ssl

+ 12 - 3
bin/v-list-web-domain-ssl

@@ -31,7 +31,8 @@ json_list() {
     echo "        \"NOT_AFTER\": \"$after\","
     echo "        \"SIGNATURE\": \"$signature\","
     echo "        \"PUB_KEY\": \"$pub_key\","
-    echo "        \"ISSUER\": \"$issuer\""
+    echo "        \"ISSUER\": \"$issuer\","
+    echo "        \"FORCESSL\": \"$forcessl\""
     echo -e "\t}\n}"
 }
 
@@ -58,6 +59,7 @@ shell_list() {
         echo "SIGNATURE:      $signature"
         echo "PUB_KEY:        $pub_key"
         echo "ISSUER:         $issuer"
+        echo "FORCESSL:       $forcessl"
     fi
 }
 
@@ -80,6 +82,7 @@ plain_list() {
         echo "$signature"
         echo "$pub_key"
         echo "$issuer"
+        echo "$forcessl"
     fi
 
 }
@@ -87,9 +90,9 @@ plain_list() {
 # CSV list function
 csv_list() {
     echo -n "CRT,KEY,CA,SUBJECT,ALIASES,NOT_BEFORE,NOT_AFTER,SIGNATURE,"
-    echo "PUB_KEY,ISSUER"
+    echo "PUB_KEY,ISSUER,FORCESSL"
     echo -n "\"$crt\",\"$key\",\"$ca\",\"$subj\",\"${alt_dns//,/ }\","
-    echo "\"$before\",\"$after\",\"$signature\",\"$pub_key\",\"$issuer\""
+    echo "\"$before\",\"$after\",\"$signature\",\"$pub_key\",\"$issuer\",\"$forcessl\""
 }
 
 
@@ -131,6 +134,12 @@ if [ -e "$USER_DATA/ssl/$domain.ca" ]; then
     ca=$(cat $USER_DATA/ssl/$domain.ca |sed ':a;N;$!ba;s/\n/\\n/g')
 fi
 
+# Check if force ssl is enabled
+forcessl="no"
+if ls /home/$user/conf/web/forcessl.*$domain*.conf 1> /dev/null 2>&1; then
+    forcessl="yes"
+fi
+
 # Listing data
 case $format in
     json)   json_list ;;