Prechádzať zdrojové kódy

Fix CentOS iptables

lj2007331@gmail.com 6 rokov pred
rodič
commit
eed853927c
3 zmenil súbory, kde vykonal 4 pridanie a 3 odobranie
  1. 1 1
      include/check_sw.sh
  2. 1 0
      include/init_CentOS.sh
  3. 2 2
      versions.txt

+ 1 - 1
include/check_sw.sh

@@ -44,7 +44,7 @@ installDepsDebian() {
 }
 
 installDepsCentOS() {
-  sed -i 's@^exclude@#exclude@' /etc/yum.conf
+  [ -e '/etc/yum.conf' ] && sed -i 's@^exclude@#exclude@' /etc/yum.conf
   yum clean all
 
   yum makecache

+ 1 - 0
include/init_CentOS.sh

@@ -145,6 +145,7 @@ EOF
   [ -z "${FW_PORT_FLAG}" -a "${ssh_port}" != "22" ] && sed -i "s@dport 22 -j ACCEPT@&\n-A INPUT -p tcp -m state --state NEW -m tcp --dport ${ssh_port} -j ACCEPT@" /etc/sysconfig/iptables
   /bin/cp /etc/sysconfig/{iptables,ip6tables}
   sed -i 's@icmp@icmpv6@g' /etc/sysconfig/ip6tables 
+  iptables-restore < /etc/sysconfig/iptables
   ip6tables-restore < /etc/sysconfig/ip6tables
   service iptables save
   service ip6tables save

+ 2 - 2
versions.txt

@@ -63,7 +63,7 @@ mcrypt_ver=2.6.8
 mhash_ver=0.9.9.9
 libsodium_ver=1.0.16
 argon2_ver=20171227
-imagemagick_ver=6.9.10-17
+imagemagick_ver=6.9.10-19
 imagick_ver=3.4.3
 graphicsmagick_ver=1.3.30
 gmagick_for_php7_ver=2.0.5RC1
@@ -74,7 +74,7 @@ apcu_ver=4.0.11
 apcu_for_php7_ver=5.1.14
 eaccelerator_ver=0.9.6.1
 phalcon_ver=3.4.2
-swoole_ver=4.2.9
+swoole_ver=4.2.10
 xdebug_ver=2.6.1
 
 # Ftp