Merge pull request #1164 from ywk253100/161125_iptable

Fix iptable modification conflict
This commit is contained in:
Daniel Jiang 2016-11-28 00:05:14 +08:00 committed by GitHub
commit fddb325e16
3 changed files with 3 additions and 3 deletions

View File

@ -39,7 +39,7 @@ function gc {
#Add rules to iptables #Add rules to iptables
function addIptableRules { function addIptableRules {
iptables -A INPUT -p tcp --dport 5480 -j ACCEPT iptables -A INPUT -p tcp --dport 5480 -j ACCEPT -w || true
#iptables -A INPUT -p tcp --dport 5488 -j ACCEPT #iptables -A INPUT -p tcp --dport 5488 -j ACCEPT
#iptables -A INPUT -p tcp --dport 5489 -j ACCEPT #iptables -A INPUT -p tcp --dport 5489 -j ACCEPT
} }

View File

@ -19,7 +19,7 @@ fi
#configure SSH #configure SSH
configSSH configSSH
#echo "Adding rules to iptables..." echo "Adding rules to iptables..."
addIptableRules addIptableRules
echo "Installing docker compose..." echo "Installing docker compose..."

View File

@ -10,7 +10,7 @@ source $base_dir/common.sh
#configure SSH #configure SSH
configSSH configSSH
#echo "Adding rules to iptables..." echo "Adding rules to iptables..."
addIptableRules addIptableRules
#Stop Harbor #Stop Harbor