Merge remote-tracking branch 'origin/master'

block_iran.sh

@@ -1,16 +1,17 @@
 #!/bin/sh
-#Alireza & Roozemain
-
+#Alireza
 sudo apt-get update -y
 sudo apt-get -y upgrade
 sudo apt-get install curl unzip perl xtables-addons-common libtext-csv-xs-perl libmoosex-types-netaddr-ip-perl iptables-persistent -y 
 sudo mkdir /usr/share/xt_geoip
+
+sudo wget -4 -O /usr/local/bin/geo-update.sh https://raw.githubusercontent.com/xpanel-cp/XPanel-SSH-User-Management/master/geo-update.sh
+
 chmod 755 /usr/lib/xtables-addons/xt_geoip_build
-MON=$(date +"%m")
-YR=$(date +"%Y")
-wget https://download.db-ip.com/free/dbip-country-lite-${YR}-${MON}.csv.gz -O /usr/share/xt_geoip/dbip-country-lite.csv.gz
-gunzip /usr/share/xt_geoip/dbip-country-lite.csv.gz
-/usr/lib/xtables-addons/xt_geoip_build -D /usr/share/xt_geoip/ -S /usr/share/xt_geoip/
-rm /usr/share/xt_geoip/dbip-country-lite.csv
+bash /usr/local/bin/geo-update.sh
 
-echo -e "\n Download Success GEOIP Library  \n"
+sudo iptables -A OUTPUT -m geoip -p tcp --destination-port 80 --dst-cc IR -j DROP
+sudo iptables -A OUTPUT -m geoip -p tcp --destination-port 443 --dst-cc IR -j DROP
+iptables-save
+clear
+echo -e "Blocked Port 80 and 443 IRAN \n"

cli.sh

@@ -50,7 +50,9 @@ function show_menu() {
     echo "5. Remove XPanel"
     echo "6. Remove All Admin XPanel"
     echo "7. Change Banner Text"
-    echo "8. Exit"
+    echo "8. Blocked Port 80 and 443 IRAN"
+    echo "9. UnBlock Port 80 and 443 IRAN"
+    echo "10. Exit"
 }
 
 # Function to select an option
@@ -98,7 +100,7 @@ connect = 0.0.0.0:$sshport
             reboot
             ;;
         4)
-            bash <(curl -Ls https://raw.githubusercontent.com/Alirezad07/X-Panel-SSH-User-Management/main/install.sh --ipv4)
+            bash <(curl -Ls https://github.com/xpanel-cp/XPanel-SSH-User-Management/raw/master/install.sh --ipv4)
             ;;
         5)
         echo "You accept the risk of removing the panel (y/n)"
@@ -124,7 +126,13 @@ cat << EOF > /root/banner.txt
 $banner
 EOF
             ;;
-        8)
+            8)
+            bash <(curl -Ls https://github.com/xpanel-cp/XPanel-SSH-User-Management/raw/master/block_iran.sh --ipv4)
+            ;;
+            9)
+             sudo iptables -F
+            ;;
+        10)
             echo "Exiting the menu."
             exit 0
             ;;

geo-update.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+MON=$(date +"%m")
+YR=$(date +"%Y")
+wget https://download.db-ip.com/free/dbip-country-lite-${YR}-${MON}.csv.gz -O /usr/share/xt_geoip/dbip-country-lite.csv.gz
+gunzip /usr/share/xt_geoip/dbip-country-lite.csv.gz
+/usr/lib/xtables-addons/xt_geoip_build -D /usr/share/xt_geoip/ -S /usr/share/xt_geoip/
+rm /usr/share/xt_geoip/dbip-country-lite.csv

install.sh

@@ -382,7 +382,7 @@ wait
 systemctl restart stunnel4 &
 wait
 curl -o /root/xpanel.sh https://raw.githubusercontent.com/xpanel-cp/XPanel-SSH-User-Management/master/cli.sh
-
+chown www-data:www-data /var/www/html/example/index.php
 clear
 
 echo -e "************ XPanel ************ \n"

t2.shh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# install addons
+apt install xtables-addons-common libnet-cidr-lite-perl libtext-csv-xs-perl libgeoip2-perl -y
+
+modprobe xt_geoip
+echo "xt_geoip" | tee -a /etc/modules-load.d/modules.conf
+
+mkdir -p /tmp/geoip
+cd /tmp/geoip
+
+MON=$(date +"%m")
+YR=$(date +"%Y")
+wget https://download.db-ip.com/free/dbip-country-lite-${YR}-${MON}.csv.gz -O GeoLite2-Country-CSV.zip
+
+# use this command to unzip that downloaded file to a database directory
+/usr/lib/xtables-addons/xt_geoip_dl
+
+# move to that db dir
+dir="$(ls)"
+cd $dir
+
+# compile database  and copy to system
+mkdir -p /usr/share/xt_geoip
+/usr/lib/xtables-addons/xt_geoip_build -D /usr/share/xt_geoip
+
+cd
+rm -rf /tmp/geoip
+