Преглед изворни кода

Suppress leftover debug output

Robert Zollner пре 5 година
родитељ
комит
2b21db87a1
3 измењених фајлова са 4 додато и 3 уклоњено
  1. 1 2
      bin/v-add-user-sftp-key
  2. 2 0
      bin/v-list-firewall-ipset
  3. 1 1
      bin/v-update-firewall-ipset

+ 1 - 2
bin/v-add-user-sftp-key

@@ -58,8 +58,7 @@ if [ ! -f "${AUTHKEY_FILE}" ] || [ "$new_pubkey" = true ]; then
     pubkey_str=$(cat "${PUBKEY_FILE}")
     pubkey_desc="[${user}]filemanager.ssh.key"
 
-    if grep --quiet -F "[${user}]filemanager.ssh.key" "${AUTHKEY_FILE}"; then
-        echo "remove old pub key from authkeys file"
+    if grep --quiet --no-messages -F "[${user}]filemanager.ssh.key" "${AUTHKEY_FILE}"; then
         sed -i "/ \[${user}\]filemanager\.ssh\.key\$/d" "${AUTHKEY_FILE}"
     fi
 

+ 2 - 0
bin/v-list-firewall-ipset

@@ -86,6 +86,8 @@ csv_list() {
     done < <(cat $HESTIA/data/firewall/ipset.conf)
 }
 
+[ ! -f "$HESTIA/data/firewall/ipset.conf" ] && touch "$HESTIA/data/firewall/ipset.conf"
+
 # Listing data
 case $format in
     json)   json_list ;;

+ 1 - 1
bin/v-update-firewall-ipset

@@ -27,7 +27,7 @@ is_system_enabled "$FIREWALL_SYSTEM" 'FIREWALL_SYSTEM'
 
 ipset_hstobject='../../data/firewall/ipset'
 
-for ipset_name in $(search_objects "$ipset_hstobject" 'SUSPENDED' 'no' 'LISTNAME'); do
+for ipset_name in $(search_objects "$ipset_hstobject" 'SUSPENDED' 'no' 'LISTNAME' 2>/dev/null); do
 
     ipset_time="$(get_object_value "$ipset_hstobject" 'LISTNAME' "$ipset_name" '$TIME')"
     ipset_date="$(get_object_value "$ipset_hstobject" 'LISTNAME' "$ipset_name" '$DATE')"