Merge branch '123.09beta01'

centminmod · Jan 30, 2017 · 141f887 · 141f887
2 parents 2b2b8de + d9e03a9
commit 141f887
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/inc/csfinstall.inc b/inc/csfinstall.inc
@@ -187,6 +187,10 @@ if [[ "$CENTOS_SEVEN" = '7' ]]; then
     fi
 fi
 
+    if [ -f /usr/local/src/centminmod/tools/csfcf.sh ]; then
+        /usr/local/src/centminmod/tools/csfcf.sh auto
+    fi
+
     echo "*************************************************"
     cecho "* CSF firewall installed " $boldgreen
     echo "*************************************************"

diff --git a/tools/csfcf.sh b/tools/csfcf.sh
@@ -131,8 +131,10 @@ csfadd() {
 	if [[ "$(awk -F '= ' '/^IPV6 =/ {print $2}' /etc/csf/csf.conf | sed -e 's|\"||g')" = '1' ]]; then
 	for ip in $CFIP6S; 
 	do
-		csf -a "$ip" cloudflare
-		echo "ip" >> /etc/csf/csf.ignore
+		if [[ "$(grep "$ip" /etc/csf/csf.allow >/dev/null 2>&1; echo $?)" = '1' ]]; then
+			csf -a "$ip" cloudflare
+			echo "ip" >> /etc/csf/csf.ignore
+		fi
 	done
 	fi
 }