github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-14 02:28:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

*Add letsencrypt to output

Browse source
This commit is contained in:
Derrick Hammer 2016-10-18 18:15:45 -04:00
commit f17fcc1f2e
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
bin/v-list-web-domain
View file

@ -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"
}

13
bin/v-list-web-domains
View file

@ -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)