Merge pull request #548 from midoks/dev

常规更新

class/core/site_api.py

@@ -2815,10 +2815,10 @@ location ^~ {from} {\n\
                 listen = re.search(rep, conf).group()
                 
                 if version == '1.25.3.1':
-                    http_ssl = "\n\tlisten 443 ssl;#reuseport"
-                    http_ssl = http_ssl + "\n\tlisten [::]:443 ssl;#reuseport"
-                    http_ssl = http_ssl + "\n\tlisten 443 quic;#reuseport"
-                    http_ssl = http_ssl + "\n\tlisten [::]:443 quic;#reuseport"
+                    http_ssl = "\n\tlisten 443 ssl;"
+                    http_ssl = http_ssl + "\n\tlisten [::]:443 ssl;"
+                    http_ssl = http_ssl + "\n\tlisten 443 quic;"
+                    http_ssl = http_ssl + "\n\tlisten [::]:443 quic;"
                     http_ssl = http_ssl + "\n\thttp2 on;"
                 else:
                     http_ssl = "\n\tlisten 443 ssl http2;"

data/tpl/nginx.conf

@@ -1,5 +1,6 @@
 server
 {
+    # reuseport 只能在一个server出现一次
     listen {$PORT};
     listen [::]:{$PORT};
     server_name {$SERVER_NAME};

plugins/openresty/install.sh

@@ -121,10 +121,17 @@ Install_openresty()
 		# OPENSSL_LIB_DEPEND_DIR=`brew info openssl@1.1 | grep ${BREW_DIR}/Cellar/openssl@1.1 | cut -d \  -f 1 | awk 'END {print}'`
 		# OPTIONS="${OPTIONS} --with-openssl=${OPENSSL_LIB_DEPEND_DIR}"
 	else
-		if [ "$VERSION" == "1.25.3.1" ]; then
-			OPTIONS="${OPTIONS} --with-http_v3_module"
+		if [ ! -f ${openrestyDir}/openssl-${opensslVersion}.tar.gz ];then
+	        wget --no-check-certificate -O ${openrestyDir}/openssl-${opensslVersion}.tar.gz https://www.openssl.org/source/openssl-${opensslVersion}.tar.gz
+	    fi
 
+	    if [ ! -d ${openrestyDir}/openssl-${opensslVersion} ];then
+			cd ${openrestyDir} &&  tar -zxvf openssl-${opensslVersion}.tar.gz
+		fi
+		OPTIONS="${OPTIONS} --with-openssl=${openrestyDir}/openssl-${opensslVersion}"
 
+		if [ "$VERSION" == "1.25.3.1" ]; then
+			OPTIONS="${OPTIONS} --with-http_v3_module"
 
 			if [ ! -f ${openrestyDir}/libressl-${libresslVersion}.tar.gz ];then
 		        wget --no-check-certificate -O ${openrestyDir}/libressl-${libresslVersion}.tar.gz https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${libresslVersion}.tar.gz
@@ -134,15 +141,6 @@ Install_openresty()
 				cd ${openrestyDir} &&  tar -zxvf libressl-${libresslVersion}.tar.gz
 			fi
 		    
-			if [ ! -f ${openrestyDir}/openssl-${opensslVersion}.tar.gz ];then
-		        wget --no-check-certificate -O ${openrestyDir}/openssl-${opensslVersion}.tar.gz https://www.openssl.org/source/openssl-${opensslVersion}.tar.gz
-		    fi
-
-		    if [ ! -d ${openrestyDir}/openssl-${opensslVersion} ];then
-				cd ${openrestyDir} &&  tar -zxvf openssl-${opensslVersion}.tar.gz
-			fi
-
-		    OPTIONS="${OPTIONS} --with-openssl=${openrestyDir}/openssl-${opensslVersion}"
 		    OPTIONS="${OPTIONS} --with-cc-opt=-I${openrestyDir}/libressl-${libresslVersion}/libressl/build/include"
 		    OPTIONS="${OPTIONS} --with-cc-opt=-I${openrestyDir}/libressl-${libresslVersion}/libressl/build/lib"