From beb085e95c9e3180594b957b9d19ee6f45cfdef6 Mon Sep 17 00:00:00 2001
From: Wankko Ree <wkr@wkr.moe>
Date: Sun, 14 Aug 2022 15:19:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3`MariaDB=2010.8`=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=E5=90=8E=E6=98=BE=E7=A4=BA=E4=B8=BA`MariaDB=2010.7`?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/mariadb/versions/10.8/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mariadb/versions/10.8/install.sh b/plugins/mariadb/versions/10.8/install.sh
index 8321b1fad..32b441803 100755
--- a/plugins/mariadb/versions/10.8/install.sh
+++ b/plugins/mariadb/versions/10.8/install.sh
@@ -86,7 +86,7 @@ Install_app()
 		make -j${cpuCore} && make install && make clean
 
 		if [ -d $serverPath/mariadb ];then
-			echo '10.7' > $serverPath/mariadb/version.pl
+			echo '10.8' > $serverPath/mariadb/version.pl
 			echo '安装完成' > $install_tmp
 		else
 			# rm -rf ${mariadbDir}/mariadb-${MY_VER}

From 1054fd14005b0cded7a27d346909e4ec1f286656 Mon Sep 17 00:00:00 2001
From: msycn <85003651+msycn@users.noreply.github.com>
Date: Wed, 2 Nov 2022 17:15:55 -0400
Subject: [PATCH 2/2] update cloudfare_real_ip.conf to 2022.11

Apr 8, 2021:
104.16.0.0/12 removed from ips-v4
104.16.0.0/13 added to ips-v4
104.24.0.0/14 added to ips-v4
https://www.cloudflare.com/ips-v4
https://www.cloudflare.com/ips-v6
---
 rewrite/nginx/cloudfare_real_ip.conf | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/rewrite/nginx/cloudfare_real_ip.conf b/rewrite/nginx/cloudfare_real_ip.conf
index ff540c422..cd19beb0e 100644
--- a/rewrite/nginx/cloudfare_real_ip.conf
+++ b/rewrite/nginx/cloudfare_real_ip.conf
@@ -1,28 +1,28 @@
 location / {
 
 	# https://www.cloudflare.com/zh-cn/ips/
+    set_real_ip_from 173.245.48.0/20;
     set_real_ip_from 103.21.244.0/22;
     set_real_ip_from 103.22.200.0/22;
     set_real_ip_from 103.31.4.0/22;
-    set_real_ip_from 104.16.0.0/13;
-    set_real_ip_from 104.24.0.0/14;
-    set_real_ip_from 108.162.192.0/18;
-    set_real_ip_from 131.0.72.0/22;
     set_real_ip_from 141.101.64.0/18;
-    set_real_ip_from 162.158.0.0/15;
-	set_real_ip_from 172.64.0.0/13;
-	set_real_ip_from 173.245.48.0/20;
-	set_real_ip_from 188.114.96.0/20;
-	set_real_ip_from 190.93.240.0/20;
-	set_real_ip_from 197.234.240.0/22;
+    set_real_ip_from 108.162.192.0/18;
+    set_real_ip_from 190.93.240.0/20;
+    set_real_ip_from 188.114.96.0/20;
+    set_real_ip_from 197.234.240.0/22;
 	set_real_ip_from 198.41.128.0/17;
+	set_real_ip_from 162.158.0.0/15;
+	set_real_ip_from 104.16.0.0/13;
+	set_real_ip_from 104.24.0.0/14;
+	set_real_ip_from 172.64.0.0/13;
+	set_real_ip_from 131.0.72.0/22;
 	set_real_ip_from 2400:cb00::/32;
 	set_real_ip_from 2606:4700::/32;
 	set_real_ip_from 2803:f800::/32;
 	set_real_ip_from 2405:b500::/32;
 	set_real_ip_from 2405:8100::/32;
-    set_real_ip_from 2c0f:f248::/32;
     set_real_ip_from 2a06:98c0::/29;
+    set_real_ip_from 2c0f:f248::/32;
     # use any of the following two
     real_ip_header CF-Connecting-IP;
     #real_ip_header X-Forwarded-For;
@@ -40,4 +40,4 @@ location / {
 	} 
 } 
 
-rewrite /wp-admin$ $scheme://$host$uri/ permanent;
\ No newline at end of file
+rewrite /wp-admin$ $scheme://$host$uri/ permanent;