From f17fcc1f2e94db152f215daf2b996d88ae3341b6 Mon Sep 17 00:00:00 2001
From: Derrick Hammer <derrick@derrickhammer.com>
Date: Tue, 18 Oct 2016 18:15:45 -0400
Subject: [PATCH] *Add letsencrypt to output

---
 bin/v-list-web-domain  | 10 +++++++---
 bin/v-list-web-domains | 13 +++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/bin/v-list-web-domain b/bin/v-list-web-domain
index a3e162ab..9a0e81da 100755
--- a/bin/v-list-web-domain
+++ b/bin/v-list-web-domain
@@ -31,6 +31,7 @@ json_list() {
         "STATS_USER": "'$STATS_USER'",
         "SSL": "'$SSL'",
         "SSL_HOME": "'$SSL_HOME'",
+        "LETSENCRYPT": "'$LETSENCRYPT'",
         "FTP_USER": "'$FTP_USER'",
         "FTP_PATH": "'$FTP_PATH'",
         "AUTH_USER": "'$AUTH_USER'",
@@ -56,6 +57,9 @@ shell_list() {
     fi
     if [ ! -z "$SSL" ] && [ "$SSL" != 'no' ]; then
         echo "SSL:            $SSL / $SSL_HOME"
+        if [ ! -z "$LETSENCRYPT" ] && [ "$LETSENCRYPT" != 'no' ]; then
+         echo "LETSENCRYPT:        $LETSENCRYPT"
+        fi
     fi
     echo "TEMPLATE:       $TPL"
     if [ ! -z "$WEB_BACKEND" ]; then
@@ -84,7 +88,7 @@ shell_list() {
 # PLAIN list function
 plain_list() {
     echo -ne "$DOMAIN\t$IP\t$IP6\t$U_DISK\t$U_BANDWIDTH\t$TPL\t"
-    echo -ne "$ALIAS\t$STATS\t$STATS_USER\t$SSL\t$SSL_HOME\t"
+    echo -ne "$ALIAS\t$STATS\t$STATS_USER\t$SSL\t$SSL_HOME\t,$LETSENCRYPT"
     echo -ne "$FTP_USER\t$FTP_PATH\t$AUTH_USER\t$BACKEND\t$PROXY\t"
     echo -e "$PROXY_EXT\t$SUSPENDED\t$TIME\t$DATE"
 }
@@ -92,10 +96,10 @@ plain_list() {
 # CSV list function
 csv_list() {
     echo -n "DOMAIN,IP,IP6,U_DISK,U_BANDWIDTH,TPL,ALIAS,STATS,STATS_USER,SSL,"
-    echo -n "SSL_HOME,FTP_USER,FTP_PATH,AUTH_USER,BACKEND,PROXY,PROXY_EXT,"
+    echo -n "SSL_HOME,LETSENCRYPT,FTP_USER,FTP_PATH,AUTH_USER,BACKEND,PROXY,PROXY_EXT,"
     echo "SUSPENDED,TIME,DATE"
     echo -n "$DOMAIN,$IP,$IP6,$U_DISK,$U_BANDWIDTH,$TPL,\"$ALIAS\",$STATS"
-    echo -n "\"$STATS_USER\",$SSL,$SSL_HOME,\"$FTP_USER\",\"$FTP_PATH\","
+    echo -n "\"$STATS_USER\",$SSL,$SSL_HOME,$LETSENCRYPT,\"$FTP_USER\",\"$FTP_PATH\","
     echo -n "\"$AUTH_USER\",$BACKEND,$PROXY,\"$PROXY_EXT\",$SUSPENDED,$TIME,"
     echo  "$DATE"
 }
diff --git a/bin/v-list-web-domains b/bin/v-list-web-domains
index 48186fee..290411f4 100755
--- a/bin/v-list-web-domains
+++ b/bin/v-list-web-domains
@@ -35,6 +35,7 @@ json_list() {
         "STATS_USER": "'$STATS_USER'",
         "SSL": "'$SSL'",
         "SSL_HOME": "'$SSL_HOME'",
+        "LETSENCRYPT": "'$LETSENCRYPT'",
         "FTP_USER": "'$FTP_USER'",
         "FTP_PATH": "'$FTP_PATH'",
         "AUTH_USER": "'$AUTH_USER'",
@@ -58,11 +59,11 @@ json_list() {
 # SHELL list function
 shell_list() {
     IFS=$'\n'
-    echo "DOMAIN   IP   TPL   SSL   DISK   BW   SPND   DATE"
-    echo "------   --   ---   ---   ----   --   ----   ----"
+    echo "DOMAIN   IP   TPL   SSL   LETSENCRYPT   DISK   BW   SPND   DATE"
+    echo "------   --   ---   ---   -----------   ----   --   ----   ----"
     while read str; do
         eval $str
-        echo "$DOMAIN $IP $TPL $SSL $U_DISK $U_BANDWIDTH $SUSPENDED $DATE"
+        echo "$DOMAIN $IP $TPL $SSL $LETSENCRYPT $U_DISK $U_BANDWIDTH $SUSPENDED $DATE"
     done < <(cat $USER_DATA/web.conf)
 }
 
@@ -72,7 +73,7 @@ plain_list() {
     while read str; do
         eval $str
         echo -ne "$DOMAIN\t$IP\t$IP6\t$U_DISK\t$U_BANDWIDTH\t$TPL\t"
-        echo -ne "$ALIAS\t$STATS\t$STATS_USER\t$SSL\t$SSL_HOME\t"
+        echo -ne "$ALIAS\t$STATS\t$STATS_USER\t$SSL\t$SSL_HOME\t$LETSENCRYPT\t"
         echo -ne "$FTP_USER\t$FTP_PATH\t$AUTH_USER\t$BACKEND\t$PROXY\t"
         echo -e "$PROXY_EXT\t$SUSPENDED\t$TIME\t$DATE"
     done < <(cat $USER_DATA/web.conf)
@@ -82,12 +83,12 @@ plain_list() {
 csv_list() {
     IFS=$'\n'
     echo -n "DOMAIN,IP,IP6,U_DISK,U_BANDWIDTH,TPL,ALIAS,STATS,STATS_USER,"
-    echo -n "SSL,SSL_HOME,FTP_USER,FTP_PATH,AUTH_USER,BACKEND,PROXY,"
+    echo -n "SSL,SSL_HOME,LETSENCRYPT,FTP_USER,FTP_PATH,AUTH_USER,BACKEND,PROXY,"
     echo "PROXY_EXT,SUSPENDED,TIME,DATE"
     while read str; do
         eval $str
         echo -n "$DOMAIN,$IP,$IP6,$U_DISK,$U_BANDWIDTH,$TPL,"
-        echo -n "\"$ALIAS\",$STATS,\"$STATS_USER\",$SSL,$SSL_HOME,"
+        echo -n "\"$ALIAS\",$STATS,\"$STATS_USER\",$SSL,$SSL_HOME,$LETSENCRYPT,"
         echo -n "\"$FTP_USER\",\"$FTP_PATH\",\"$AUTH_USER\",$BACKEND,$PROXY,"
         echo "\"$PROXY_EXT\",$SUSPENDED,$TIME,$DATE"
     done < <(cat $USER_DATA/web.conf)