github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-19 21:04:06 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes from Neilpang

Browse source
This commit is contained in:
Serghey Rodin 2015-10-22 17:23:44 +03:00
commit e3f636cb3a
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/v-add-firewall-rule
View file

@ -52,7 +52,7 @@ is_system_enabled "$FIREWALL_SYSTEM" 'FIREWALL_SYSTEM'
get_next_fw_rule get_next_fw_rule
validate_format 'rule' validate_format 'rule'
is_object_new '../../data/firewall/rules' 'RULE' "$rule" is_object_new '../../data/firewall/rules' 'RULE' "$rule"
if [ ! -z "$comment"]; then if [ ! -z "$comment" ]; then
validate_format 'comment' validate_format 'comment'
fi fi

6
bin/v-update-firewall
View file

@ -51,6 +51,12 @@ if [ $? -ne 0 ]; then
conntrack_ftp='no' conntrack_ftp='no'
fi fi
# Checking custom OpenSSH port
sshport=$(grep '^Port ' /etc/ssh/sshd_config | head -1 | cut -d ' ' -f 2)
if [[ "$sshport" =~ ^[0-9]+$ ]] && [ "$sshport" -ne "22" ]; then
sed -i "s/PORT='22'/PORT=\'$sshport\'/" $rules
fi
# Creating temporary file # Creating temporary file
tmp=$(mktemp) tmp=$(mktemp)