File tree Expand file tree Collapse file tree 3 files changed +4
-3
lines changed
Expand file tree Collapse file tree 3 files changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -58,8 +58,7 @@ if [ ! -f "${AUTHKEY_FILE}" ] || [ "$new_pubkey" = true ]; then
5858 pubkey_str=$( cat " ${PUBKEY_FILE} " )
5959 pubkey_desc=" [${user} ]filemanager.ssh.key"
6060
61- if grep --quiet -F " [${user} ]filemanager.ssh.key" " ${AUTHKEY_FILE} " ; then
62- echo " remove old pub key from authkeys file"
61+ if grep --quiet --no-messages -F " [${user} ]filemanager.ssh.key" " ${AUTHKEY_FILE} " ; then
6362 sed -i " / \[${user} \]filemanager\.ssh\.key\$ /d" " ${AUTHKEY_FILE} "
6463 fi
6564
Original file line number Diff line number Diff line change @@ -86,6 +86,8 @@ csv_list() {
8686 done < <( cat $HESTIA /data/firewall/ipset.conf)
8787}
8888
89+ [ ! -f " $HESTIA /data/firewall/ipset.conf" ] && touch " $HESTIA /data/firewall/ipset.conf"
90+
8991# Listing data
9092case $format in
9193 json) json_list ;;
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ is_system_enabled "$FIREWALL_SYSTEM" 'FIREWALL_SYSTEM'
2727
2828ipset_hstobject=' ../../data/firewall/ipset'
2929
30- for ipset_name in $( search_objects " $ipset_hstobject " ' SUSPENDED' ' no' ' LISTNAME' ) ; do
30+ for ipset_name in $( search_objects " $ipset_hstobject " ' SUSPENDED' ' no' ' LISTNAME' 2> /dev/null ) ; do
3131
3232 ipset_time=" $( get_object_value " $ipset_hstobject " ' LISTNAME' " $ipset_name " ' $TIME' ) "
3333 ipset_date=" $( get_object_value " $ipset_hstobject " ' LISTNAME' " $ipset_name " ' $DATE' ) "
You can’t perform that action at this time.
0 commit comments