voltron/NodeMgmt
1
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

update

Browse Source
This commit is contained in:
David Schroeder
2023-11-13 07:45:47 -06:00
parent 173d7fcfef
commit 7420f315cc
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
inc/certs.inc
View File

@@ -270,10 +270,6 @@ LISTCERTS(){
i=`expr $i + 1` i=`expr $i + 1`
done done
for c in ${!CERTLIST[@]}; do
echo "HERE: ${c}=${CERTLIST[${c}]}"
done
if [ ${EDIT} -eq 1 ]; then if [ ${EDIT} -eq 1 ]; then
echo echo
DIVIDER . yellow ${dl} DIVIDER . yellow ${dl}
@@ -284,7 +280,6 @@ LISTCERTS(){
trap exitspacing EXIT trap exitspacing EXIT
while [ "${editc^}" != "E" ]; do while [ "${editc^}" != "E" ]; do
echo "C HERE: ${certid}"
unset certid unset certid
echo -e "\033[K" echo -e "\033[K"
echo -e "\033[K" echo -e "\033[K"
@@ -306,6 +301,7 @@ LISTCERTS(){
exit 0 exit 0
elif [ "${certid}" != "" ] && [ "${CERTLIST[${certid}]}" != "" ]; then elif [ "${certid}" != "" ] && [ "${CERTLIST[${certid}]}" != "" ]; then
ecbo "HERE: ${certid} = '${CERTLIST[${certid}]}'"
cert=${CERTLIST[${certid}]} cert=${CERTLIST[${certid}]}
certdir=${NM_CERTPATH}/live/${cert} certdir=${NM_CERTPATH}/live/${cert}
SUBJECT=$(${NCMD} openssl x509 -in ${certdir}/cert.pem -noout -subject|grep -oP '(?<=CN = )[^,]+'|sort -uV) SUBJECT=$(${NCMD} openssl x509 -in ${certdir}/cert.pem -noout -subject|grep -oP '(?<=CN = )[^,]+'|sort -uV)

5
inc/sites.inc
View File

@@ -809,7 +809,7 @@ SITEINFO(){
else else
lock='-' lock='-'
fi fi
f=0; editc=0 editc=0
until [ "${editc^}" = "C" ]; do until [ "${editc^}" = "C" ]; do
echo -e "\033[K${idsCL[White]}0) Site Address(es): ${idsCL[Cyan]}${idsST[Bold]}${servernames}${idsST[Reset]}" echo -e "\033[K${idsCL[White]}0) Site Address(es): ${idsCL[Cyan]}${idsST[Bold]}${servernames}${idsST[Reset]}"
echo -e "\033[K${idsCL[White]}1) Site Type: ${idsCL[Cyan]}${idsST[Bold]}${type}${idsST[Reset]}" echo -e "\033[K${idsCL[White]}1) Site Type: ${idsCL[Cyan]}${idsST[Bold]}${type}${idsST[Reset]}"
@@ -862,7 +862,7 @@ SITEINFO(){
;; ;;
7) echo -e "\033[K\n\033[K" 7) echo -e "\033[K\n\033[K"
echo -en "\033[KEnter new Proxy Address: " echo -en "\033[KEnter new Proxy Address: "
read -i "${server}" -e server read -i "${server}" -e server
echo -e "\033[5A"; for (( c=1; c<=5; c++ )); do echo -e "\033[K"; done; echo -e "\033[5A" echo -e "\033[5A"; for (( c=1; c<=5; c++ )); do echo -e "\033[K"; done; echo -e "\033[5A"
;; ;;
8) [ "${scheme}" == "http" ] && scheme='https' || scheme='http';; 8) [ "${scheme}" == "http" ] && scheme='https' || scheme='http';;
@@ -916,7 +916,6 @@ SITEINFO(){
esac esac
fi fi
f=1
done done
else #no site else #no site
echo -e "\033[3A"; for (( c=1; c<=3; c++ )); do echo -e "\r\033[K"; done; echo -e "\033[4A" echo -e "\033[3A"; for (( c=1; c<=3; c++ )); do echo -e "\r\033[K"; done; echo -e "\033[4A"