Fix for firewall setup

This commit is contained in:
Serghey Rodin 2014-10-26 13:24:30 +02:00
commit 5904999d2b
3 changed files with 32 additions and 32 deletions

View file

@ -495,16 +495,6 @@ if [ "$srv_type" = 'micro' ]; then
rm -f /usr/local/vesta/data/templates/web/apache2/phpfcgid.*
fi
# Firewall configuartion
wget $CHOST/$VERSION/firewall.tar.gz -O firewall.tar.gz
tar -xzf firewall.tar.gz
rm -f firewall.tar.gz
if [ "$disable_iptables" = 'yes' ]; then
sed -i "s/iptables//" $VESTA/conf/vesta.conf
else
/usr/local/vesta/bin/v-update-firewall
fi
# Generating SSL certificate
$VESTA/bin/v-generate-ssl-cert $(hostname) $email 'US' 'California' \
'San Francisco' 'Vesta Control Panel' 'IT' > /tmp/vst.pem
@ -797,6 +787,16 @@ $VESTA/bin/v-add-database admin default default $(gen_pass) mysql
# Configuring system ips
$VESTA/bin/v-update-sys-ip
# Firewall configuartion
wget $CHOST/$VERSION/firewall.tar.gz -O firewall.tar.gz
tar -xzf firewall.tar.gz
rm -f firewall.tar.gz
if [ "$disable_iptables" = 'yes' ]; then
sed -i "s/iptables//" $VESTA/conf/vesta.conf
else
/usr/local/vesta/bin/v-update-firewall
fi
# Get main ip
main_ip=$(ifconfig |grep 'inet addr:' |grep -v 127.0.0.1 |head -n1 | \
cut -f2 -d: | cut -f1 -d ' ')

View file

@ -554,18 +554,6 @@ if [ "$srv_type" = 'micro' ]; then
rm -f /usr/local/vesta/data/templates/web/httpd/phpfcgid.*
fi
# Firewall configuration
wget $CHOST/$VERSION/firewall.tar.gz -O firewall.tar.gz
tar -xzf firewall.tar.gz
rm -f firewall.tar.gz
if [ "$disable_iptables" = 'yes' ]; then
sed -i "s/iptables//" $VESTA/conf/vesta.conf
chkconfig iptables off
service iptables stop
else
/usr/local/vesta/bin/v-update-firewall
fi
# Generating SSL certificate
$VESTA/bin/v-generate-ssl-cert $(hostname) $email 'US' 'California' \
'San Francisco' 'Vesta Control Panel' 'IT' > /tmp/vst.pem
@ -849,6 +837,18 @@ $VESTA/bin/v-add-database admin default default $(gen_pass) mysql
# Configuring system ips
$VESTA/bin/v-update-sys-ip
# Firewall configuration
wget $CHOST/$VERSION/firewall.tar.gz -O firewall.tar.gz
tar -xzf firewall.tar.gz
rm -f firewall.tar.gz
if [ "$disable_iptables" = 'yes' ]; then
sed -i "s/iptables//" $VESTA/conf/vesta.conf
chkconfig iptables off
service iptables stop
else
/usr/local/vesta/bin/v-update-firewall
fi
# Get main ip
main_ip=$(ifconfig |grep 'inet addr:' |grep -v 127.0.0.1 |head -n1 | \
cut -f2 -d: | cut -f1 -d ' ')

View file

@ -501,16 +501,6 @@ if [ "$codename" = 'trusty' ]; then
rm -f /usr/local/vesta/data/templates/web/apache2/phpcgi.*
fi
# Firewall configuartion
wget $CHOST/$VERSION/firewall.tar.gz -O firewall.tar.gz
tar -xzf firewall.tar.gz
rm -f firewall.tar.gz
if [ "$disable_iptables" = 'yes' ]; then
sed -i "s/iptables//" $VESTA/conf/vesta.conf
else
/usr/local/vesta/bin/v-update-firewall
fi
# Generating SSL certificate
$VESTA/bin/v-generate-ssl-cert $(hostname) $email 'US' 'California' \
'San Francisco' 'Vesta Control Panel' 'IT' > /tmp/vst.pem
@ -819,6 +809,16 @@ $VESTA/bin/v-add-database admin default default $(gen_pass) mysql
# Configuring system ips
$VESTA/bin/v-update-sys-ip
# Firewall configuartion
wget $CHOST/$VERSION/firewall.tar.gz -O firewall.tar.gz
tar -xzf firewall.tar.gz
rm -f firewall.tar.gz
if [ "$disable_iptables" = 'yes' ]; then
sed -i "s/iptables//" $VESTA/conf/vesta.conf
else
/usr/local/vesta/bin/v-update-firewall
fi
# Get main ip
main_ip=$(ifconfig |grep 'inet addr:' |grep -v 127.0.0.1 |head -n1 | \
cut -f2 -d: | cut -f1 -d ' ')