update

moeYuiYui · Sep 16, 2024 · 97d0103 · 97d0103
1 parent 225394e
commit 97d0103
Show file tree

Hide file tree

Showing 13 changed files with 50 additions and 40 deletions.
diff --git a/conf/example/enable-lnmpa-ssl-vhost-example.conf b/conf/example/enable-lnmpa-ssl-vhost-example.conf
@@ -1,7 +1,8 @@
 server
     {
-        listen 443 ssl ;
-        #listen [::]:443 ssl ;
+        listen 443 ssl;
+        #listen [::]:443 ssl;
+        http2 on;
         server_name     lnmp.org www.lnmp.org;
         index index.html index.htm index.php default.html default.htm default.php;
         root  /home/wwwroot/lnmp.org;

diff --git a/conf/example/enable-ssl-example-letsencrypt-with-301.conf b/conf/example/enable-ssl-example-letsencrypt-with-301.conf
@@ -1,7 +1,8 @@
 server
     {
-        listen 443 ssl ;
-        #listen [::]:443 ssl ;
+        listen 443 ssl;
+        #listen [::]:443 ssl;
+        http2 on;
         server_name  lnmp.org www.lnmp.org;
         index index.html index.htm index.php default.html default.htm default.php;
         root  /home/wwwroot/lnmp.org;

diff --git a/conf/example/enable-ssl-example-with-301.conf b/conf/example/enable-ssl-example-with-301.conf
@@ -1,7 +1,8 @@
 server
     {
-        listen 443 ssl ;
-        #listen [::]:443 ssl ;
+        listen 443 ssl;
+        #listen [::]:443 ssl;
+        http2 on;
         server_name  lnmp.org www.lnmp.org;
         index index.html index.htm index.php default.html default.htm default.php;
         root  /home/wwwroot/lnmp.org;

diff --git a/conf/example/enable-ssl-example.conf b/conf/example/enable-ssl-example.conf
@@ -1,7 +1,8 @@
 server
     {
-        listen 443 ssl ;
-        #listen [::]:443 ssl ;
+        listen 443 ssl;
+        #listen [::]:443 ssl;
+        http2 on;
         server_name  lnmp.org www.lnmp.org;
         index index.html index.htm index.php default.html default.htm default.php;
         root  /home/wwwroot/lnmp.org;

diff --git a/conf/example/magento2-example.conf b/conf/example/magento2-example.conf
@@ -202,8 +202,9 @@ server
 
 server
     {
-        listen 443 ssl ;
-        #listen [::]:443 ssl ;
+        listen 443 ssl;
+        #listen [::]:443 ssl;
+        http2 on;
         server_name     lnmp.org www.lnmp.org;
         index index.php;
         set $MAGE_ROOT /home/wwwroot/lnmp.org;

diff --git a/conf/example/nextcloud-example.conf b/conf/example/nextcloud-example.conf
@@ -102,8 +102,9 @@ server
 
 server
     {
-        listen 80;
-        #listen [::]:80;
+        listen 443 ssl;
+        #listen [::]:443 ssl;
+        http2 on;
         server_name lnmp.org www.lnmp.org;
         root /home/wwwroot/nextcloud;
 

diff --git a/conf/example/nginx-reverse-proxy-example.conf b/conf/example/nginx-reverse-proxy-example.conf
@@ -26,8 +26,9 @@ server
 
 server
     {
-        listen 443 ssl ;
-        #listen [::]:443 ssl ;
+        listen 443 ssl;
+        #listen [::]:443 ssl;
+        http2 on;
         server_name example.com www.example.com;
 
         ssl_certificate /usr/local/nginx/conf/ssl/example.com.crt;

diff --git a/conf/example/owncloud-example.conf b/conf/example/owncloud-example.conf
@@ -104,8 +104,9 @@ server
 
 server
     {
-        listen 443 ssl ;
-        #listen [::]:443 ssl ;
+        listen 443 ssl;
+        #listen [::]:443 ssl;
+        http2 on;
         server_name lnmp.org www.lnmp.org;
         root /home/wwwroot/owncloud;
 

diff --git a/conf/lnmp b/conf/lnmp
@@ -1229,8 +1229,9 @@ Create_SSL_Config()
 
 server
     {
-        listen 443 ssl ;
-        #listen [::]:443 ssl ;
+        listen 443 ssl;
+        #listen [::]:443 ssl;
+        http2 on;
         server_name ${domain} ${moredomain};
         index index.html index.htm index.php default.html default.htm default.php;
         root  ${vhostdir};
@@ -1282,7 +1283,7 @@ EOF
     fi
 
     if [ "${enable_ipv6}" == "y" ]; then
-        sed -i 's/#listen \[::\]:443 ssl ;/listen \[::\]:443 ssl ;/g' /usr/local/nginx/conf/vhost/${domain}.conf
+        sed -i 's/#listen \[::\]:443 ssl;/listen \[::\]:443 ssl;/g' /usr/local/nginx/conf/vhost/${domain}.conf
     fi
 
     echo "Test Nginx configure file......"

diff --git a/conf/lnmpa b/conf/lnmpa
@@ -955,8 +955,9 @@ Create_SSL_Config()
 
 server
     {
-        listen 443 ssl ;
-        #listen [::]:443 ssl ;
+        listen 443 ssl;
+        #listen [::]:443 ssl;
+        http2 on;
         server_name ${domain} ${moredomain};
         index index.html index.htm index.php default.html default.htm default.php;
         root  ${vhostdir};
@@ -1007,7 +1008,7 @@ EOF
     fi
 
     if [ "${enable_ipv6}" == "y" ]; then
-        sed -i 's/#listen \[::\]:443 ssl ;/listen \[::\]:443 ssl ;/g' /usr/local/nginx/conf/vhost/${domain}.conf
+        sed -i 's/#listen \[::\]:443 ssl;/listen \[::\]:443 ssl;/g' /usr/local/nginx/conf/vhost/${domain}.conf
     fi
 
     echo "Test Nginx configure file......"

diff --git a/include/main.sh b/include/main.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-DB_Info=('MySQL 5.1.73' 'MySQL 5.5.62' 'MySQL 5.6.51' 'MySQL 5.7.44' 'MySQL 8.0.37' 'MySQL 8.4.0' 'MariaDB 5.5.68' 'MariaDB 10.4.34' 'MariaDB 10.5.25' 'MariaDB 10.6.18' 'MariaDB 10.11.8')
-PHP_Info=('PHP 5.2.17' 'PHP 5.3.29' 'PHP 5.4.45' 'PHP 5.5.38' 'PHP 5.6.40' 'PHP 7.0.33' 'PHP 7.1.33' 'PHP 7.2.34' 'PHP 7.3.33' 'PHP 7.4.33' 'PHP 8.0.30' 'PHP 8.1.29' 'PHP 8.2.20' 'PHP 8.3.8')
-Apache_Info=('Apache 2.2.34' 'Apache 2.4.57')
+DB_Info=('MySQL 5.1.73' 'MySQL 5.5.62' 'MySQL 5.6.51' 'MySQL 5.7.44' 'MySQL 8.0.39' 'MySQL 8.4.2' 'MariaDB 5.5.68' 'MariaDB 10.4.34' 'MariaDB 10.5.26' 'MariaDB 10.6.19' 'MariaDB 10.11.9')
+PHP_Info=('PHP 5.2.17' 'PHP 5.3.29' 'PHP 5.4.45' 'PHP 5.5.38' 'PHP 5.6.40' 'PHP 7.0.33' 'PHP 7.1.33' 'PHP 7.2.34' 'PHP 7.3.33' 'PHP 7.4.33' 'PHP 8.0.30' 'PHP 8.1.29' 'PHP 8.2.23' 'PHP 8.3.11')
+Apache_Info=('Apache 2.2.34' 'Apache 2.4.62')
 
 Database_Selection()
 {

diff --git a/include/version.sh b/include/version.sh
@@ -24,7 +24,7 @@ LuaNginxModule='lua-nginx-module-0.10.26'
 LuaRestyCore='lua-resty-core-0.1.28'
 LuaRestyLrucache='lua-resty-lrucache-0.13'
 NgxDevelKit='ngx_devel_kit-0.3.3'
-Nginx_Ver='nginx-1.26.1'
+Nginx_Ver='nginx-1.26.2'
 NgxFancyIndex_Ver='ngx-fancyindex-0.5.2'
 if [ "${DBSelect}" = "1" ]; then
     Mysql_Ver='mysql-5.1.73'
@@ -35,19 +35,19 @@ elif [ "${DBSelect}" = "3" ]; then
 elif [ "${DBSelect}" = "4" ]; then
     Mysql_Ver='mysql-5.7.44'
 elif [ "${DBSelect}" = "5" ]; then
-    Mysql_Ver='mysql-8.0.37'
+    Mysql_Ver='mysql-8.0.39'
 elif [ "${DBSelect}" = "6" ]; then
-    Mysql_Ver='mysql-8.4.0'
+    Mysql_Ver='mysql-8.4.2'
 elif [ "${DBSelect}" = "7" ]; then
     Mariadb_Ver='mariadb-5.5.68'
 elif [ "${DBSelect}" = "8" ]; then
     Mariadb_Ver='mariadb-10.4.34'
 elif [ "${DBSelect}" = "9" ]; then
-    Mariadb_Ver='mariadb-10.5.25'
+    Mariadb_Ver='mariadb-10.5.26'
 elif [ "${DBSelect}" = "10" ]; then
-    Mariadb_Ver='mariadb-10.6.18'
+    Mariadb_Ver='mariadb-10.6.19'
 elif [ "${DBSelect}" = "11" ]; then
-    Mariadb_Ver='mariadb-10.11.8'
+    Mariadb_Ver='mariadb-10.11.9'
 fi
 if [ "${PHPSelect}" = "1" ]; then
     Php_Ver='php-5.2.17'
@@ -74,9 +74,9 @@ elif [ "${PHPSelect}" = "11" ]; then
 elif [ "${PHPSelect}" = "12" ]; then
     Php_Ver='php-8.1.29'
 elif [ "${PHPSelect}" = "13" ]; then
-    Php_Ver='php-8.2.20'
+    Php_Ver='php-8.2.23'
 elif [ "${PHPSelect}" = "14" ]; then
-    Php_Ver='php-8.3.8'
+    Php_Ver='php-8.3.11'
 fi
 if [[ "${PHPSelect}" =~ ^[123]$ ]]; then
     PhpMyAdmin_Ver='phpMyAdmin-4.0.10.20-all-languages'
@@ -90,7 +90,7 @@ APR_Util_Ver='apr-util-1.6.3'
 if [ "${ApacheSelect}" = "1" ]; then
     Apache_Ver='httpd-2.2.34'
 elif [ "${ApacheSelect}" = "2" ]; then
-    Apache_Ver='httpd-2.4.57'
+    Apache_Ver='httpd-2.4.62'
 fi
 
 Pureftpd_Ver='pure-ftpd-1.0.51'

diff --git a/readme.md b/readme.md
@@ -119,12 +119,12 @@ MySQL 5.5 | 2 | PHP 5.3 | 2 | Jemalloc | 2 | Apache 2.4 | 2
 MySQL 5.6 | 3 | PHP 5.4 | 3 | TCMalloc | 3 | |
 MySQL 5.7 | 4 | PHP 5.5 | 4 | | | |
 MySQL 8.0 | 5 | PHP 5.6 | 5 | | | |
-MariaDB 5.5 | 6 | PHP 7.0 | 6 | | | |
-MariaDB 10.4 | 7 | PHP 7.1 | 7 | | | |
-MariaDB 10.5 | 8 | PHP 7.2 | 8 | | | |
-MariaDB 10.6 | 9 | PHP 7.3 | 9 | | | |
-MariaDB 10.11 | 10 | PHP 7.4 | 10 | | | |
-MySQL 8.4 | 11 | PHP 8.0 | 11 | | | |
+MySQL 8.4 | 6 | PHP 8.0 | 11 | | | |
+MariaDB 5.5 | 7 | PHP 7.0 | 6 | | | |
+MariaDB 10.4 | 8 | PHP 7.1 | 7 | | | |
+MariaDB 10.5 | 9 | PHP 7.2 | 8 | | | |
+MariaDB 10.6 | 10 | PHP 7.3 | 9 | | | |
+MariaDB 10.11 | 11 | PHP 7.4 | 10 | | | |
 不安装数据库 | 0 | PHP 8.1 | 12 | | | |
 | | | PHP 8.2 | 13 | | | |
 | | | PHP 8.3 | 14 | | | |