From 5923167155681819ab82ecd5303c3ada3aa78157 Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 9 Apr 2024 20:00:01 +0800 Subject: [PATCH] Support ARM64. --- Dockerfile | 24 +++++- lib.sh | 4 +- nginx.sh | 247 ++++++++++++++++++++++++++++++++++++++++++++--------- 3 files changed, 233 insertions(+), 42 deletions(-) diff --git a/Dockerfile b/Dockerfile index de0b2ac..9f0bde4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,6 +44,22 @@ RUN apt update -y && apt-get install -y docker.io make \ ruby ruby-minitest ruby-net-telnet ruby-power-assert ruby-test-unit ruby-xmlrpc \ ruby2.7 rubygems-integration unzip zip libcurl4 cmake libxslt-dev +RUN apt-get install -y libssl-dev xterm dpkg-dev gnupg gpg libfreetype-dev libfreetype6-dev libice-dev libice6 libxaw7 \ + pkg-config swig4.0 tcl tcl-dev tk tk8.6 x11-utils x11proto-dev xbitmaps libx11-dev libxau-dev libxdmcp-dev libxext-dev \ + libxft-dev libxrender-dev bzip2-doc libdb5.3++ libdb5.3++-dev libdb5.3-dev libipset13 libjpeg-turbo8-dev \ + libjpeg8-dev libpcap0.8 libpcap0.8-dev libpcre16-3 libpcre32-3 libpcrecpp0v5 libsm-dev libsqlite3-0 libxss-dev \ + libxt-dev tk8.6-dev x11proto-scrnsaver-dev distro-info-data debian-keyring automake autotools-dev libsigsegv2 m4 \ + re2c libzip5 bison-doc libfl-dev libfl2 gawk-doc libtinfo5 libncurses5-dev libltdl-dev libevent-2.1-7 \ + libevent-core-2.1-7 libevent-extra-2.1-7 libevent-openssl-2.1-7 libevent-pthreads-2.1-7 zlibc libsasl2-dev \ + libblkid-dev libblkid1 libglib2.0-bin libglib2.0-dev-bin libmount-dev libmount1 libpcre2-16-0 libpcre2-32-0 \ + libpcre2-dev libpcre2-posix2 libselinux1-dev libsepol1-dev libjpeg62 libjpeg-dev libjpeg-turbo8-dev libjpeg8-dev \ + comerr-dev krb5-multidev libgssrpc4 libkadm5clnt-mit11 libkadm5srv-mit11 libkdb5-9 libpq5 gettext-base libcroco3 \ + libcap-dev libc-client2007e libpam0g libpam0g-dev mlock psmisc libc-ares2 libgd-tools libjbig-dev libjpeg-dev \ + libjpeg-turbo8-dev libjpeg8-dev liblzma-dev libtiff-dev libtiffxx5 libvpx-dev libxpm-dev libwebpdemux2 \ + liblockfile-bin liblockfile1 lockfile-progs procmail sendmail-base sendmail-bin sensible-mda anacron logrotate \ + checksecurity libcurl4-doc libidn11-dev libkrb5-dev libldap2-dev librtmp-dev libssh2-1-dev readline-doc sqlite3-doc \ + swig-doc swig-examples ncompress tar-scripts tar-doc tk-doc rsyslog debian-archive-keyring + # See https://www.aapanel.com # Note: We use very simple user `ossrs` and password `12345678` for local development environment, you should change it in production environment. # Note: We disable the HTTPS by sed `SET_SSL=false` in install.sh. @@ -64,7 +80,11 @@ RUN cd /tmp && \ # Note: We install nginx 1.22 by default, like: # http://localhost:7800/plugin?action=install_plugin -# sName=nginx&version=1.22&min_version=1&type=1 +# sName=nginx&version=1.22&min_version=1&type=0 +# Install from binary: +# https://node.aapanel.com/install/4/nginx.sh +# Build from source: +# https://node.aapanel.com/install/0/nginx.sh RUN cd /tmp && \ echo "Install NGINX for aaPanel." && \ - curl -sSL https://node.aapanel.com/install/4/nginx.sh |bash -s -- install 1.22 + curl -sSL https://node.aapanel.com/install/0/nginx.sh |bash -s -- install 1.22 diff --git a/lib.sh b/lib.sh index e4366f1..8899861 100644 --- a/lib.sh +++ b/lib.sh @@ -26,7 +26,7 @@ UBUNTU_VER=$(cat /etc/issue|grep -i ubuntu|awk '{print $2}'|cut -d. -f1) DEBIAN_VER=$(cat /etc/issue|grep -i debian|awk '{print $3}') if [ "${UBUNTU_VER}" == "18" ] || [ "${UBUNTU_VER}" == "20" ];then debPath="u${UBUNTU_VER}" -elif [ "${DEBIAN_VER}" == "10" ] || [ "${DEBIAN_VER}" == "11" ]; then +elif [ "${DEBIAN_VER}" == "10" ] || [ "${DEBIAN_VER}" == "11" ] || [ "${DEBIAN_VER}" == "12" ]; then debPath="d${DEBIAN_VER}" fi @@ -249,7 +249,7 @@ Install_Lib() fi Install_Aptlib - Install_Sendmail +# Install_Sendmail Run_User="www" groupadd ${Run_User} useradd -s /sbin/nologin -g ${Run_User} ${Run_User} diff --git a/nginx.sh b/nginx.sh index f7edf0c..0e62b40 100644 --- a/nginx.sh +++ b/nginx.sh @@ -4,20 +4,22 @@ export PATH LANG=en_US.UTF-8 public_file=/www/server/panel/install/public.sh -publicFileMd5=$(md5sum ${public_file} 2>/dev/null | awk '{print $1}') -md5check="8e49712d1fd332801443f8b6fd7f9208" -if [ "${publicFileMd5}" != "${md5check}" ]; then - wget -O Tpublic.sh https://download.bt.cn/install/public.sh -T 20 - publicFileMd5=$(md5sum Tpublic.sh 2>/dev/null | awk '{print $1}') - if [ "${publicFileMd5}" == "${md5check}" ]; then - \cp -rpa Tpublic.sh $public_file - fi - rm -f Tpublic.sh -fi . $public_file +publicFileMd5=$(md5sum ${public_file} 2>/dev/null|awk '{print $1}') +md5check="3a4b75cd48e16fcdf2945e41598da6bd" +if [ "${publicFileMd5}" != "${md5check}" ] && [ -z "${NODE_URL}" ]; then + wget -O Tpublic.sh https://download.bt.cn/install/public.sh -T 20; + publicFileMd5=$(md5sum Tpublic.sh 2>/dev/null|awk '{print $1}') + if [ "${publicFileMd5}" == "${md5check}" ]; then + \cp -rpa Tpublic.sh $public_file + fi + rm -f Tpublic.sh + . $public_file +fi + download_Url=$NODE_URL -tengine='3.0.0' +tengine='3.1.0' nginx_108='1.8.1' nginx_112='1.12.2' nginx_114='1.14.2' @@ -31,7 +33,8 @@ nginx_121='1.21.4' nginx_122='1.22.1' nginx_123='1.23.4' nginx_124='1.24.0' -openresty='1.19.9.1' +nginx_125='1.25.4' +openresty='1.25.3.1' Root_Path=$(cat /var/bt_setupPath.conf) Setup_Path=$Root_Path/server/nginx @@ -41,6 +44,7 @@ Is_64bit=$(getconf LONG_BIT) ARM_CHECK=$(uname -a | grep -E 'aarch64|arm|ARM') if [ "$2" == "1.24" ];then ARM_CHECK="" + JEM_CHECK="disable" fi LUAJIT_VER="2.0.4" LUAJIT_INC_PATH="luajit-2.0" @@ -56,6 +60,13 @@ if [ "${loongarch64Check}" ]; then exit fi +# if [ "$2" == "1.25" ];then +# ulimit -n 10240 +# wget -O nginx.sh ${download_Url}/install/0/nginx5.sh +# . nginx.sh $1 $2 +# exit +# fi + #HUAWEI_CLOUD_EULER=$(cat /etc/os-release |grep '"Huawei Cloud EulerOS 1') #EULER_OS=$(cat /etc/os-release |grep "EulerOS 2.0 ") #if [ "${HUAWEI_CLOUD_EULER}" ] || [ "${EULER_OS}" ];then @@ -67,18 +78,62 @@ if [ -z "${cpuCore}" ]; then cpuCore="1" fi +Error_Send(){ + MIN_O=$(date +%M) + if [ $((MIN_O % 2)) -eq 0 ]; then + exit 1 + fi + if [ ! -f "/tmp/nginx_i.pl" ];then + touch /tmp/nginx_i.pl + TIME=$(date "+%Y-%m-%d %H:%M:%S") + P_VERSION=$(cat /www/server/panel/class/common.py|grep g.version|grep -oE 8.0.[0-9]+) + ls /etc/init.d/ | xargs -n 5 | pr -t -5 > /tmp/nginx_err.pl + cat /tmp/pack_i.pl >> /tmp/nginx_err.pl + cat /tmp/gd_i.pl >> /tmp/nginx_err.pl + tail -n 15 /tmp/nginx_config.pl /tmp/nginx_make.pl /tmp/nginx_install.pl >> /tmp/nginx_err.pl + echo Bit:${SYS_BIT} Mem:${MEM_TOTAL}M Core:${CPU_INFO} gcc:${GCC_VER} cmake:${CMAKE_VER} >> /tmp/nginx_err.pl + echo ${SYS_VERSION} ${SYS_INFO} >> /tmp/nginx_err.pl + echo "$nginxVersion install Failed" >> /tmp/nginx_err.pl + ERR_MSG=$(cat /tmp/nginx_err.pl) + rm -f /tmp/nginx_config.pl /tmp/nginx_make.pl /tmp/nginx_install.pl /tmp/nginx_err.pl /tmp/pack_i.pl /tmp/gd_i.pl + curl --request POST \ + --url "http://api.bt.cn/bt_error/index.php" \ + --data "UID=89045" \ + --data "PANEL_VERSION=${P_VERSION}"\ + --data "REQUEST_DATE=${TIME}" \ + --data "OS_VERSION=${SYS_VERSION}" \ + --data "REMOTE_ADDR=192.168.168.1641" \ + --data "REQUEST_URI=nginx" \ + --data "USER_AGENT=${SYS_INFO}" \ + --data "ERROR_INFO=${ERR_MSG}" \ + --data "PACK_TIME=${TIME}" \ + --data "TYPE=3" + fi + exit 1 +} System_Lib() { if [ "${PM}" == "yum" ] || [ "${PM}" == "dnf" ]; then - Pack="gcc gcc-c++ curl curl-devel libtermcap-devel ncurses-devel libevent-devel readline-devel libuuid-devel" + Pack="gcc gcc-c++ curl curl-devel libtermcap-devel ncurses-devel libevent-devel readline-devel libuuid-devel gd-devel libxml2-devel libxslt-devel" ${PM} install ${Pack} -y + yum install zlib-devel -y + yum -y reinstall gcc gcc-c++ autoconf automake + yum reinstall gd gd-devel -y 2>&1 >> /tmp/pack_i.pl + ls /usr/include/gd.h /usr/lib64/libgd.so.3 2>&1 |tee /tmp/gd_i.pl + wget -O fix_install.sh $download_Url/tools/fix_install.sh + nohup bash fix_install.sh > /www/server/panel/install/fix.log 2>&1 & elif [ "${PM}" == "apt-get" ]; then LIBCURL_VER=$(dpkg -l | grep libx11-6 | awk '{print $3}') if [ "${LIBCURL_VER}" == "2:1.6.9-2ubuntu1.3" ]; then apt remove libx11* -y apt install libx11-6 libx11-dev libx11-data -y fi + apt-get update -y Pack="gcc g++ libgd3 libgd-dev libevent-dev libncurses5-dev libreadline-dev uuid-dev" ${PM} install ${Pack} -y + apt-get install libxslt1-dev -y 2>&1 >> /tmp/pack_i.pl + apt-get install libgd-dev -y 2>&1 >> /tmp/pack_i.pl + apt-get install libxml2-dev -y 2>&1 >> /tmp/pack_i.pl + apt-get install zlib1g-dev -y fi } @@ -137,7 +192,7 @@ Install_LuaJIT2(){ ldconfig } Install_LuaJIT() { - if [ "${version}" == "1.23" ] || [ "${version}" == "1.24" ] || [ "${version}" == "tengine" ];then + if [ "${version}" == "1.23" ] || [ "${version}" == "1.24" ] || [ "${version}" == "tengine" ] || [ "${version}" == "1.25" ];then Install_LuaJIT2 return fi @@ -230,7 +285,7 @@ Download_Src() { #lua_nginx_module LuaModVer="0.10.13" - if [ "${version}" == "1.23" ] || [ "${version}" == "1.24" ] || [ "${version}" == "tengine" ];then + if [ "${version}" == "1.23" ] || [ "${version}" == "1.24" ] || [ "${version}" == "tengine" ] || [ "${version}" == "1.25" ];then LuaModVer="0.10.24" fi wget -c -O lua-nginx-module-${LuaModVer}.zip ${download_Url}/src/lua-nginx-module-${LuaModVer}.zip @@ -277,7 +332,7 @@ Install_Configure() { [ -f "/www/server/panel/install/nginx_prepare.sh" ] && . /www/server/panel/install/nginx_prepare.sh [ -f "/www/server/panel/install/nginx_configure.pl" ] && ADD_EXTENSION=$(cat /www/server/panel/install/nginx_configure.pl) - if [ -f "/usr/local/lib/libjemalloc.so" ] && [ -z "${ARM_CHECK}" ]; then + if [ -f "/usr/local/lib/libjemalloc.so" ] && [ -z "${ARM_CHECK}" ] && [ -z "${JEM_CHECK}" ]; then jemallocLD="--with-ld-opt="-ljemalloc"" fi @@ -299,10 +354,14 @@ Install_Configure() { fi ENABLE_STICKY="--add-module=${Setup_Path}/src/nginx-sticky-module" - if [ "$version" == "1.23" ] || [ "$version" == "1.24" ] || [ "${version}" == "tengine" ];then + if [ "$version" == "1.23" ] || [ "$version" == "1.24" ] || [ "${version}" == "tengine" ] || [ "${version}" == "openresty" ] || [ "$version" == "1.25" ];then ENABLE_STICKY="" fi + if [ "$version" == "1.25" ];then + ENABLE_HTTP3="--with-http_v3_module" + fi + name=nginx i_path=/www/server/panel/install/$name @@ -331,18 +390,20 @@ Install_Configure() { export LUAJIT_INC=/usr/local/include/${LUAJIT_INC_PATH}/ export LD_LIBRARY_PATH=/usr/local/lib/:$LD_LIBRARY_PATH - ./configure --user=www --group=www --prefix=${Setup_Path} ${ENABLE_LUA} --add-module=${Setup_Path}/src/ngx_cache_purge ${ENABLE_STICKY} --with-openssl=${Setup_Path}/src/openssl --with-pcre=pcre-${pcre_version} ${ENABLE_HTTP2} --with-http_stub_status_module --with-http_ssl_module --with-http_image_filter_module --with-http_gzip_static_module --with-http_gunzip_module --with-ipv6 --with-http_sub_module --with-http_flv_module --with-http_addition_module --with-http_realip_module --with-http_mp4_module --add-module=${Setup_Path}/src/ngx_http_substitutions_filter_module-master --with-ld-opt="-Wl,-E" --with-cc-opt="-Wno-error" ${jemallocLD} ${ENABLE_WEBDAV} ${ENABLE_NGX_PAGESPEED} ${ADD_EXTENSION} ${i_make_args} - make -j${cpuCore} + ./configure --user=www --group=www --prefix=${Setup_Path} ${ENABLE_LUA} --add-module=${Setup_Path}/src/ngx_cache_purge ${ENABLE_STICKY} --with-openssl=${Setup_Path}/src/openssl --with-pcre=pcre-${pcre_version} ${ENABLE_HTTP2} --with-http_stub_status_module --with-http_ssl_module --with-http_image_filter_module --with-http_gzip_static_module --with-http_gunzip_module --with-ipv6 --with-http_sub_module --with-http_flv_module --with-http_addition_module --with-http_realip_module --with-http_mp4_module --add-module=${Setup_Path}/src/ngx_http_substitutions_filter_module-master --with-ld-opt="-Wl,-E" --with-cc-opt="-Wno-error" ${jemallocLD} ${ENABLE_WEBDAV} ${ENABLE_NGX_PAGESPEED} ${ENABLE_HTTP3} ${ADD_EXTENSION} ${i_make_args} 2>&1|tee /tmp/nginx_config.pl + make -j${cpuCore} 2>&1|tee /tmp/nginx_make.pl } Install_Nginx() { - make install + make install 2>&1|tee /tmp/nginx_install.pl if [ "${version}" == "openresty" ]; then ln -sf /www/server/nginx/nginx/html /www/server/nginx/html ln -sf /www/server/nginx/nginx/conf /www/server/nginx/conf ln -sf /www/server/nginx/nginx/logs /www/server/nginx/logs ln -sf /www/server/nginx/nginx/sbin /www/server/nginx/sbin if [ -d "/www/server/btwaf" ]; then - ln -s /www/server/nginx/lualib/resty /www/server/btwaf + \cp -rpa /www/server/nginx/lualib/* /www/server/btwaf + elif [ -d "/www/server/free_waf" ];then + \cp -rpa /www/server/nginx/lualib/* /www/server/free_waf fi fi @@ -352,28 +413,122 @@ Install_Nginx() { echo -e "ERROR: nginx-${nginxVersion} installation failed." if [ -z "${SYS_VERSION}" ];then echo -e "============================================" - echo -e "检测到为非常用系统安装,请尝试安装其他Mysql版本看是否正常" + echo -e "检测到为非常用系统安装" echo -e "如无法正常安装，建议更换至Centos-7或Debian-10+或Ubuntu-20+系统安装宝塔面板" echo -e "详情请查看系统兼容表：https://docs.qq.com/sheet/DUm54VUtyTVNlc21H?tab=BB08J2" echo -e "特殊情况可通过以下联系方式寻求安装协助情况" echo -e "============================================" fi + echo -e "安装失败，请截图以上报错信息发帖至论坛www.bt.cn/bbs求助" + rm -rf ${Setup_Path} + + if [ ! -f "/www/server/panel/install/nginx_down.pl" ];then + FILE_KEY=("./configure: error: no /www/server/nginx/src/ngx_devel_kit/config was found" "./configure: No such file or directory" "./configure: error: no /www/server/nginx/src/ngx_http_substitutions_filter_module-master/config was found" "./configure: error: no /www/server/nginx/src/nginx-dav-ext-module/config was found" "auto/options: No such file or directory" "./configure: error: no /www/server/nginx/src/ngx_cache_purge/config was found" "/www/server/nginx/src/lua_nginx_module/config was found") + for key in "${FILE_KEY[@]}"; do + if grep -q "$key" /tmp/nginx_config.pl; then + echo -e "检测到文件下载不完整导致安装失败，请尝试重新安装nginx看是否正常" + echo -e "或使用极速安装看是否正常" + touch /www/server/panel/install/nginx_down.pl + exit 1 + fi + done + fi + + if [ "${i_make_args}" ];then + echo -e "检测到使用自定义编译参数进行安装nginx" + echo -e "请根据报错自行排查问题，或取消自定义编译参数重新安装" + exit 1 + fi + Centos8Check=$(cat /etc/redhat-release | grep ' 8.' | grep -iE 'centos') if [ "${Centos8Check}" ];then echo -e "Centos8官方已经停止支持" echo -e "如是新安装系统服务器建议更换至Centos-7/Debian-11/Ubuntu-22系统安装宝塔面板" + exit 1 fi - echo -e "安装失败，请截图以上报错信息发帖至论坛www.bt.cn/bbs求助" - echo -e "或手机访问以下链接、扫码联系企业微信技术求助" - echo -e "帖子或企业微信注明企业版用户，将获得极速响应技术支持" - echo -e "============================================" - echo -e "联系链接:https://work.weixin.qq.com/kfid/kfc9072f0e29a53bd52" - echo -e "============================================" - rm -rf ${Setup_Path} - exit 1 + + WSL_CHECK=$(uname -a|grep Microsoft) + if [ "${WSL_CHECK}" ];then + echo -e "宝塔未兼容测试过Microsoft WSL子系统进行安装" + echo -e "建议使用虚拟机安装ubuntu-22安装宝塔面板" + exit 1 + fi + VELINUX_CHECK=$(uname -a|grep velinux1) + if [ "$VELINUX_CHECK" ];then + echo -e "宝塔未兼容测试过velinux系统进行安装" + echo -e "建议更换至Centos-7或Debian-10+或Ubuntu-20+系统安装宝塔面板板" + exit 1 + fi + rockchip64_CHECK=$(uname -a|grep rockchip64) + if [ "$VELINUX_CHECK" ];then + echo -e "宝塔未兼容测试过rockchip64系统进行安装" + echo -e "建议更换至Centos-7或Debian-10+或Ubuntu-20+服务器系统安装宝塔面板板" + exit 1 + fi + KALI_CHECK=$(uname -a|grep Kali) + if [ "${WSL_CHECK}" ];then + echo -e "宝塔未兼容测试过Kali系统进行安装" + echo -e "建议更换至Centos-7或Debian-10+或Ubuntu-20+系统安装宝塔面板板" + exit 1 + fi + ARMBIAN_CHECK=$(uname -a|grep Armbian) + if [ "${ARMBIAN_CHECK}" ];then + echo -e "宝塔未详细兼容测试过Armbian系统进行安装" + echo -e "建议更换至Centos-7或Debian-10+或Ubuntu-20+系统安装宝塔面板板" + exit 1 + fi + RJ3328_CHECK=$(uname -a|grep rk3328) + if [ "${RJ3328_CHECK}" ];then + echo -e "宝塔未兼容测试过电视盒子进行安装" + echo -e "建议更换至Centos-7或Debian-10+或Ubuntu-20+系统安装宝塔面板板" + exit 1 + fi + XIAOMI_CHECK=$(uname -a|grep xiaomi) + if [ "${XIAOMI_CHECK}" ];then + echo -e "宝塔未兼容测试过安卓手机进行安装" + echo -e "建议更换至Centos-7或Debian-10+或Ubuntu-20+服务器系统安装宝塔面板板" + exit 1 + fi + if [ -f "/etc/redhat-release" ];then + LINUX_KIT_CHECK=$(uname -a|grep linuxkit) + if [ "${LINUX_KIT_CHECK}" ];then + echo -e "宝塔未兼容测试过linuxkit(docker)环境下进行安装" + echo -e "建议更换至服务器系统Centos-7或Debian-10+或Ubuntu-20+系统安装宝塔面板板" + exit 1 + fi + BBR_CHECK=$(uname -a|grep bbrplus) + if [ "${BBR_CHECK}" ];then + echo -e "检测已使用bbr更新过内核，建议更新完内核在安装宝塔面板然后再安装软件" + echo -e "或如需高版本内核，可使用Ubuntu-22/Debian-12进行安装宝塔面板" + exit 1 + fi + ELREPO_CHECK=$(uname -a|grep elrepo) + if [ "${ELREPO_CHECK}" ];then + echo -e "检测更新过内核，建议更新完内核在安装宝塔面板然后再安装软件" + echo -e "或如需高版本内核，可使用Ubuntu-22/Debian-12进行安装宝塔面板" + exit 1 + fi + fi + + if [ "${PM}" == "apt-get" ];then + UBUNTU_23_CHECK=$(cat /etc/issue|grep Ubuntu|grep 23) + if [ "${UBUNTU_23_CHECK}" ];then + echo -e "宝塔未兼容测试过Ubuntu-23（预览版）环境下进行安装" + echo -e "建议更换至服务器系统Centos-7或Debian-12或Ubuntu-22系统安装宝塔面板板" + exit 1 + fi + DEBIAN_9_CHECK=$(cat /etc/issue|grep Debian|grep 9) + if [ "${UBUNTU_23_CHECK}" ];then + echo -e "Debian-9官方已经不在支持" + echo -e "建议更换至服务器系统Centos-7或Debian-12或Ubuntu-22系统安装宝塔面板板" + exit 1 + fi + fi + + Error_Send fi - if [ "${version}" == "1.23" ] || [ "${version}" == "1.24" ] || [ "${version}" == "tengine" ];then + if [ "${version}" == "1.23" ] || [ "${version}" == "1.24" ] || [ "${version}" == "tengine" ] || [ "${version}" == "1.25" ];then wget -c -O lua-resty-core-0.1.26.zip ${download_Url}/src/lua-resty-core-0.1.26.zip unzip lua-resty-core-0.1.26.zip cd lua-resty-core-0.1.26 @@ -445,7 +600,7 @@ Set_Conf() { wget -O ${Setup_Path}/conf/nginx.conf ${download_Url}/conf/nginx1.conf -T20 wget -O ${Setup_Path}/conf/pathinfo.conf ${download_Url}/conf/pathinfo.conf -T20 wget -O ${Setup_Path}/conf/enable-php.conf ${download_Url}/conf/enable-php.conf -T20 - wget -O ${Setup_Path}/html/index.html ${download_Url}/error/index.html -T 5 + wget -O ${Setup_Path}/html/index.html ${download_Url}/error/index.html -T 20 chmod 755 /www/server/nginx/ chmod 755 /www/server/nginx/html/ @@ -463,7 +618,7 @@ server { } EOF echo "" >/www/server/nginx/conf/enable-php-00.conf - for phpV in 52 53 54 55 56 70 71 72 73 74 75 80 81 82; do + for phpV in 52 53 54 55 56 70 71 72 73 74 75 80 81 82 83; do cat >${Setup_Path}/conf/enable-php-${phpV}.conf <