Skip to content

Commit 2006c7a

Browse files
committed
Add forcessl parameter.
1 parent fc3a1c5 commit 2006c7a

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

bin/v-list-web-domain-ssl

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ json_list() {
3131
echo " \"NOT_AFTER\": \"$after\","
3232
echo " \"SIGNATURE\": \"$signature\","
3333
echo " \"PUB_KEY\": \"$pub_key\","
34-
echo " \"ISSUER\": \"$issuer\""
34+
echo " \"ISSUER\": \"$issuer\","
35+
echo " \"FORCESSL\": \"$forcessl\""
3536
echo -e "\t}\n}"
3637
}
3738

@@ -58,6 +59,7 @@ shell_list() {
5859
echo "SIGNATURE: $signature"
5960
echo "PUB_KEY: $pub_key"
6061
echo "ISSUER: $issuer"
62+
echo "FORCESSL: $forcessl"
6163
fi
6264
}
6365

@@ -80,16 +82,17 @@ plain_list() {
8082
echo "$signature"
8183
echo "$pub_key"
8284
echo "$issuer"
85+
echo "$forcessl"
8386
fi
8487

8588
}
8689

8790
# CSV list function
8891
csv_list() {
8992
echo -n "CRT,KEY,CA,SUBJECT,ALIASES,NOT_BEFORE,NOT_AFTER,SIGNATURE,"
90-
echo "PUB_KEY,ISSUER"
93+
echo "PUB_KEY,ISSUER,FORCESSL"
9194
echo -n "\"$crt\",\"$key\",\"$ca\",\"$subj\",\"${alt_dns//,/ }\","
92-
echo "\"$before\",\"$after\",\"$signature\",\"$pub_key\",\"$issuer\""
95+
echo "\"$before\",\"$after\",\"$signature\",\"$pub_key\",\"$issuer\",\"$forcessl\""
9396
}
9497

9598

@@ -131,6 +134,12 @@ if [ -e "$USER_DATA/ssl/$domain.ca" ]; then
131134
ca=$(cat $USER_DATA/ssl/$domain.ca |sed ':a;N;$!ba;s/\n/\\n/g')
132135
fi
133136

137+
# Check if force ssl is enabled
138+
forcessl="no"
139+
if ls /home/$user/conf/web/forcessl.*$domain*.conf 1> /dev/null 2>&1; then
140+
forcessl="yes"
141+
fi
142+
134143
# Listing data
135144
case $format in
136145
json) json_list ;;

0 commit comments

Comments
 (0)