Strona główna Odkrywaj Pomoc
Zaloguj się
joker
/
oneinstack
kopia lustrzana https://github.com/oneinstack/oneinstack/
1
0
Forkuj 0
Pliki Problemy 0 Wiki
Przeglądaj źródła

Update OneinStack

lj2007331@gmail.com 6 lat temu
rodzic
1eac02b2b8
commit
72ed7c07b0
7 zmienionych plików z 59 dodań i 54 usunięć
Zunifikowany widok Pokaż statystyki zmian
  1. 12 10
      backup_setup.sh
  2. 26 25
      config/index.html
  3. 9 9
      config/index_cn.html
  4. 2 0
      include/memory.sh
  5. 1 1
      include/tengine.sh
  6. 1 1
      include/upgrade_web.sh
  7. 8 8
      versions.txt

+ 12 - 10
backup_setup.sh
Wyświetl plik 

@@ -241,20 +241,21 @@ if [ `echo ${desc_bk} | grep -e 4` ]; then
 
   [ ! -e "${python_install_dir}/lib/coscmd" ] && ${python_install_dir}/bin/pip install coscmd >/dev/null 2>&1
 
   [ ! -e "${python_install_dir}/lib/coscmd" ] && ${python_install_dir}/bin/pip install coscmd >/dev/null 2>&1
 
   while :; do echo
 
   while :; do echo
 
     echo 'Please select your backup qcloud datacenter:'
 
     echo 'Please select your backup qcloud datacenter:'
 
-    echo -e "\t ${CMSG} 1${CEND}. 北京一区(华北)  ${CMSG}2${CEND}. 北京"
 
-    echo -e "\t ${CMSG} 3${CEND}. 上海(华东)      ${CMSG}4${CEND}. 广州(华南)"
 
-    echo -e "\t ${CMSG} 5${CEND}. 成都(西南)      ${CMSG}6${CEND}. 重庆"
 
-    echo -e "\t ${CMSG} 7${CEND}. 新加坡          ${CMSG}8${CEND}. 香港"
 
-    echo -e "\t ${CMSG} 9${CEND}. 多伦多         ${CMSG}10${CEND}. 法兰克福"
 
-    echo -e "\t ${CMSG}11${CEND}. 孟买           ${CMSG}12${CEND}. 首尔"
 
-    echo -e "\t ${CMSG}13${CEND}. 硅谷           ${CMSG}14${CEND}. 弗吉尼亚"
 
-    echo -e "\t ${CMSG}15${CEND}. 曼谷           ${CMSG}16${CEND}. 莫斯科"
 
+    echo -e "\t ${CMSG} 1${CEND}. ap-beijing-1-北京一区(华北)  ${CMSG}2${CEND}. ap-beijing-北京"
 
+    echo -e "\t ${CMSG} 3${CEND}. ap-shanghai-上海(华东)       ${CMSG}4${CEND}. ap-guangzhou-广州(华南)"
 
+    echo -e "\t ${CMSG} 5${CEND}. ap-chengdu-成都(西南)        ${CMSG}6${CEND}. ap-chongqing-重庆"
 
+    echo -e "\t ${CMSG} 7${CEND}. ap-singapore-新加坡          ${CMSG}8${CEND}. ap-hongkong-香港"
 
+    echo -e "\t ${CMSG} 9${CEND}. na-toronto-多伦多           ${CMSG}10${CEND}. eu-frankfurt-法兰克福"
 
+    echo -e "\t ${CMSG}11${CEND}. ap-mumbai-孟买              ${CMSG}12${CEND}. ap-seoul-首尔"
 
+    echo -e "\t ${CMSG}13${CEND}. na-siliconvalley-硅谷       ${CMSG}14${CEND}. na-ashburn-弗吉尼亚"
 
+    echo -e "\t ${CMSG}15${CEND}. ap-bangkok-曼谷             ${CMSG}16${CEND}. eu-moscow-莫斯科"
 
+    echo -e "\t ${CMSG}17${CEND}. ap-tokyo-东京"
 
     read -p "Please input a number:(Default 1 press Enter) " Location
 
     read -p "Please input a number:(Default 1 press Enter) " Location
 
     [ -z "${Location}" ] && Location=1
 
     [ -z "${Location}" ] && Location=1
 
-    if [[ "${Location}" =~ ^[1-9]$|^1[0-6]$ ]]; then
 
+    if [[ "${Location}" =~ ^[1-9]$|^1[0-7]$ ]]; then
 
       break
 
       break
 
     else
 
     else
 
-      echo "${CWARNING}input error! Please only input number 1~16${CEND}"
 
+      echo "${CWARNING}input error! Please only input number 1~17${CEND}"
 
     fi
 
     fi
 
   done
 
   done
 
   [ "${Location}" == '1' ] && region='ap-beijing-1'
 
   [ "${Location}" == '1' ] && region='ap-beijing-1'
 
@@ -273,6 +274,7 @@ if [ `echo ${desc_bk} | grep -e 4` ]; then
 
   [ "${Location}" == '14' ] && region='na-ashburn'
 
   [ "${Location}" == '14' ] && region='na-ashburn'
 
   [ "${Location}" == '15' ] && region='ap-bangkok'
 
   [ "${Location}" == '15' ] && region='ap-bangkok'
 
   [ "${Location}" == '16' ] && region='eu-moscow'
 
   [ "${Location}" == '16' ] && region='eu-moscow'
 
+  [ "${Location}" == '17' ] && region='ap-tokyo'
 
   while :; do echo
 
   while :; do echo
 
     read -p "Please enter the Qcloud COS APPID: " APPID
 
     read -p "Please enter the Qcloud COS APPID: " APPID
 
     [ -z "${APPID}" ] && continue
 
     [ -z "${APPID}" ] && continue

+ 26 - 25
config/index.html
Wyświetl plik 

@@ -11,7 +11,7 @@
 
 
 
   <body>
 
   <body>
 
     <nav class="navbar navbar-dark fixed-top bg-dark flex-md-nowrap p-0 shadow">
 
     <nav class="navbar navbar-dark fixed-top bg-dark flex-md-nowrap p-0 shadow">
 
-      <a class="navbar-brand col-sm-3 col-md-2 mr-0" href="./">OneinStack</a>
 
+      <a class="navbar-brand col-sm-3 col-md-2 mr-0" href="">OneinStack</a>
 
 
 
       <form class="w-100" action="https://lempstack.com/qa/" method="GET" target="_blank">
 
       <form class="w-100" action="https://lempstack.com/qa/" method="GET" target="_blank">
 
       	<input class="form-control form-control-dark w-100" type="text" placeholder="What do you want to know?" aria-label="What do you want to know?" name="qs">
 
       	<input class="form-control form-control-dark w-100" type="text" placeholder="What do you want to know?" aria-label="What do you want to know?" name="qs">
 
@@ -43,13 +43,13 @@
 
               <li class="nav-item">
 
               <li class="nav-item">
 
                 <a class="nav-link" href="###vhost" id="vhost_link">
 
                 <a class="nav-link" href="###vhost" id="vhost_link">
 
                   <span data-feather="layers"></span>
 
                   <span data-feather="layers"></span>
 
-                  Virtual host 
+                  Virtual host
 
                 </a>
 
                 </a>
 
               </li>
 
               </li>
 
               <li class="nav-item">
 
               <li class="nav-item">
 
                 <a class="nav-link" href="###db" id="db_link">
 
                 <a class="nav-link" href="###db" id="db_link">
 
                   <span data-feather="shopping-cart"></span>
 
                   <span data-feather="shopping-cart"></span>
 
-                  Database 
+                  Database
 
                 </a>
 
                 </a>
 
               </li>
 
               </li>
 
               <li class="nav-item">
 
               <li class="nav-item">
 
@@ -61,37 +61,37 @@
 
               <li class="nav-item">
 
               <li class="nav-item">
 
                 <a class="nav-link" href="###tools" id="tools_link">
 
                 <a class="nav-link" href="###tools" id="tools_link">
 
                   <span data-feather="briefcase"></span>
 
                   <span data-feather="briefcase"></span>
 
-                  Tools 
+                  Tools
 
                 </a>
 
                 </a>
 
               </li>
 
               </li>
 
               <li class="nav-item">
 
               <li class="nav-item">
 
                 <a class="nav-link" href="###manage" id="manage_link">
 
                 <a class="nav-link" href="###manage" id="manage_link">
 
                   <span data-feather="bar-chart-2"></span>
 
                   <span data-feather="bar-chart-2"></span>
 
-                  Manage service 
+                  Manage service
 
                 </a>
 
                 </a>
 
               </li>
 
               </li>
 
               <li class="nav-item">
 
               <li class="nav-item">
 
                 <a class="nav-link" href="###backup" id="backup_link">
 
                 <a class="nav-link" href="###backup" id="backup_link">
 
                   <span data-feather="disc"></span>
 
                   <span data-feather="disc"></span>
 
-                  Backup 
+                  Backup
 
                 </a>
 
                 </a>
 
               </li>
 
               </li>
 
               <li class="nav-item">
 
               <li class="nav-item">
 
                 <a class="nav-link" href="###upgrade" id="upgrade_link">
 
                 <a class="nav-link" href="###upgrade" id="upgrade_link">
 
                   <span data-feather="trending-up"></span>
 
                   <span data-feather="trending-up"></span>
 
-                  Upgrade & Uninstall 
+                  Upgrade & Uninstall
 
                 </a>
 
                 </a>
 
               </li>
 
               </li>
 
               <li class="nav-item">
 
               <li class="nav-item">
 
                 <a class="nav-link" href="###port" id="port_link">
 
                 <a class="nav-link" href="###port" id="port_link">
 
                   <span data-feather="cloud"></span>
 
                   <span data-feather="cloud"></span>
 
-                  Security group 
+                  Security group
 
                 </a>
 
                 </a>
 
               </li>
 
               </li>
 
               <li class="nav-item">
 
               <li class="nav-item">
 
                 <a class="nav-link" href="###donation" id="donation_link">
 
                 <a class="nav-link" href="###donation" id="donation_link">
 
                   <span data-feather="heart"></span>
 
                   <span data-feather="heart"></span>
 
-                  Donation 
+                  Donation
 
                 </a>
 
                 </a>
 
               </li>
 
               </li>
 
             </ul>
 
             </ul>
 
@@ -104,7 +104,7 @@
 
             </h6>
 
             </h6>
 
             <ul class="nav flex-column mb-2">
 
             <ul class="nav flex-column mb-2">
 
               <li class="nav-item">
 
               <li class="nav-item">
 
-                <a class="nav-link" href="https://oneinstack.com/" target="_blank">
 
+                <a class="nav-link" href="https://lempstack.com/" target="_blank">
 
                   <span data-feather="home"></span>
 
                   <span data-feather="home"></span>
 
                   OneinStack Home
 
                   OneinStack Home
 
                 </a>
 
                 </a>
 
@@ -112,7 +112,7 @@
 
               <li class="nav-item">
 
               <li class="nav-item">
 
                 <a class="nav-link" href="https://lempstack.com/install/" target="_blank">
 
                 <a class="nav-link" href="https://lempstack.com/install/" target="_blank">
 
                   <span data-feather="help-circle"></span>
 
                   <span data-feather="help-circle"></span>
 
-                  Install & Docs 
+                  Install & Docs
 
                 </a>
 
                 </a>
 
               </li>
 
               </li>
 
               <li class="nav-item">
 
               <li class="nav-item">
 
@@ -124,7 +124,7 @@
 
               <li class="nav-item">
 
               <li class="nav-item">
 
                 <a class="nav-link" href="https://lempstack.com/changelog/" target="_blank">
 
                 <a class="nav-link" href="https://lempstack.com/changelog/" target="_blank">
 
                   <span data-feather="link"></span>
 
                   <span data-feather="link"></span>
 
-                  ChangeLog 
+                  ChangeLog
 
                 </a>
 
                 </a>
 
               </li>
 
               </li>
 
             </ul>
 
             </ul>
 
@@ -137,12 +137,12 @@
 
 	            <h1 class="h2" id="home">Control center</h1>
 
 	            <h1 class="h2" id="home">Control center</h1>
 
 	            <div class="btn-toolbar mb-2 mb-md-0">
 
 	            <div class="btn-toolbar mb-2 mb-md-0">
 
 	              <div class="btn-group mr-2">
 
 	              <div class="btn-group mr-2">
 
-	                <a class="btn btn-sm btn-outline-primary btn_prober" href="prober.php"><span data-feather="compass"></span> prober</a>
 
-	                <a class="btn btn-sm btn-outline-primary btn_tz" href="tz.php"><span data-feather="compass"></span> 探针</a>
 
-	                <a class="btn btn-sm btn-outline-info btn_phpinfo" href="phpinfo.php"><span data-feather="info"></span> phpinfo</a>
 
-	                <a class="btn btn-sm btn-outline-secondary btn_op" href="ocp.php"><span data-feather="cpu"></span> Opcache</a>
 
+	                <a class="btn btn-sm btn-outline-primary btn_prober" href="prober.php" target="_blank"><span data-feather="compass"></span> prober</a>
 
+	                <a class="btn btn-sm btn-outline-primary btn_tz" href="tz.php" target="_blank"><span data-feather="compass"></span> 探针</a>
 
+	                <a class="btn btn-sm btn-outline-info btn_phpinfo" href="phpinfo.php" target="_blank"><span data-feather="info"></span> phpinfo</a>
 
+	                <a class="btn btn-sm btn-outline-secondary btn_op" href="ocp.php" target="_blank"><span data-feather="cpu"></span> Opcache</a>
 
 	              </div>
 
 	              </div>
 
-	              <a class="btn btn-sm btn-outline-warning mr-2 btn_pma" href="phpMyAdmin/">
 
+	              <a class="btn btn-sm btn-outline-warning mr-2 btn_pma" href="phpMyAdmin/" target="_blank">
 
 	                <span data-feather="database"></span> phpMyAdmin
 
 	                <span data-feather="database"></span> phpMyAdmin
 
 	              </a>
 
 	              </a>
 
 	            </div>
 
 	            </div>
 
@@ -191,7 +191,7 @@
 
 			              <li>Del virtual host: ./vhost.sh del</li>
 
 			              <li>Del virtual host: ./vhost.sh del</li>
 
 			              <li>Manage FTP account: ./pureftpd_vhost.sh</li>
 
 			              <li>Manage FTP account: ./pureftpd_vhost.sh</li>
 
 			            </ul>
 
 			            </ul>
 
-			            <a href="https://oneinstack.com/install/" target="_blank" type="button" class="btn btn-lg btn-block btn-primary">BROWSE DOCS</a>
 
+			            <a href="https://lempstack.com/install/" target="_blank" type="button" class="btn btn-lg btn-block btn-primary">BROWSE DOCS</a>
 
 			          </div>
 
 			          </div>
 
 			        </div>
 
 			        </div>
 
 			        <div class="card mb-4 box-shadow">
 
 			        <div class="card mb-4 box-shadow">
 
@@ -201,11 +201,11 @@
 
 			          <div class="card-body">
 
 			          <div class="card-body">
 
 			            <h1 class="card-title pricing-card-title">Online<small class="text-muted"> running</small></h1>
 
 			            <h1 class="card-title pricing-card-title">Online<small class="text-muted"> running</small></h1>
 
 			            <ul class="list-unstyled mt-3 mb-4">
 
 			            <ul class="list-unstyled mt-3 mb-4">
 
-			              <li><a href="phpMyAdmin/">phpMyAdmin</a></li>
 
+			              <li><a href="phpMyAdmin/" target="_blank">phpMyAdmin</a></li>
 
 			              <li>Manage FTP account: ./pureftpd_vhost.sh</li>
 
 			              <li>Manage FTP account: ./pureftpd_vhost.sh</li>
 
 			              <li>Backup: ./backup_setup.sh</li>
 
 			              <li>Backup: ./backup_setup.sh</li>
 
 			            </ul>
 
 			            </ul>
 
-			            <a href="https://oneinstack.com/install/" target="_blank" type="button" class="btn btn-lg btn-block btn-primary">BROWSE DOCS</a>
 
+			            <a href="https://lempstack.com/install/" target="_blank" type="button" class="btn btn-lg btn-block btn-primary">BROWSE DOCS</a>
 
 			          </div>
 
 			          </div>
 
 			        </div>
 
 			        </div>
 
 			      </div>
 
 			      </div>
 
@@ -266,7 +266,7 @@
 
 				<div class="alert alert-primary" role="alert"><code>service php-fpm {start<span class="pl-k">|</span>stop<span class="pl-k">|</span>restart<span class="pl-k">|</span>reload<span class="pl-k">|</span>status}</code></div>
 
 				<div class="alert alert-primary" role="alert"><code>service php-fpm {start<span class="pl-k">|</span>stop<span class="pl-k">|</span>restart<span class="pl-k">|</span>reload<span class="pl-k">|</span>status}</code></div>
 
 				<p class="mt-4">HHVM:</p>
 
 				<p class="mt-4">HHVM:</p>
 
 				<div class="alert alert-primary" role="alert"><code>service supervisord {start|stop|status|restart|reload}</code></div>
 
 				<div class="alert alert-primary" role="alert"><code>service supervisord {start|stop|status|restart|reload}</code></div>
 
-				Apache:</p>
 
+				<p class="mt-4">Apache:</p>
 
 				<div class="alert alert-primary" role="alert"><code>service httpd {start|restart|stop}</code></div>
 
 				<div class="alert alert-primary" role="alert"><code>service httpd {start|restart|stop}</code></div>
 
 				<p class="mt-4">Tomcat:</p>
 
 				<p class="mt-4">Tomcat:</p>
 
 				<div class="alert alert-primary" role="alert"><code>service tomcat {start|stop|status|restart}</code></div>
 
 				<div class="alert alert-primary" role="alert"><code>service tomcat {start|stop|status|restart}</code></div>
 
@@ -290,7 +290,7 @@
 
 			<section class="section" id="port_section">
 
 			<section class="section" id="port_section">
 
 	          <div class="card text-white bg-danger" style="width: 20rem;">
 
 	          <div class="card text-white bg-danger" style="width: 20rem;">
 
 				  <div class="card-header">
 
 				  <div class="card-header">
 
-				    You must specify port numbers (for TCP): 
+				    You must specify port numbers (for TCP):
 
 				  </div>
 
 				  </div>
 
 				  <ul class="list-group list-group-flush">
 
 				  <ul class="list-group list-group-flush">
 
 				    <li class="list-group-item text-danger">ssh: 22</li>
 
 				    <li class="list-group-item text-danger">ssh: 22</li>
 
@@ -300,12 +300,13 @@
 
 				  </ul>
 
 				  </ul>
 
 				</div>
 
 				</div>
 
 				<div class="list-group mt-5" style="width: 18rem;">
 
 				<div class="list-group mt-5" style="width: 18rem;">
 
-				  <a href="phpMyAdmin" class="list-group-item list-group-item-action active">
 
+				  <a class="list-group-item list-group-item-action active">
 
 				    Security Groups for Your VPC
 
 				    Security Groups for Your VPC
 
 				  </a>
 
 				  </a>
 
-				  <a href="https://docs.aws.amazon.com/vpc/latest/userguide/VPC_SecurityGroups.html" target="_blank" class="list-group-item list-group-item-action">AWS Security group</a>
 
+				  <a href="https://docs.aws.amazon.com/vpc/latest/userguide/VPC_SecurityGroups.html" target="_blank" class="list-group-item list-group-item-action">AWS Security groups</a>
 
+				  <a href="https://docs.microsoft.com/en-us/azure/virtual-network/security-overview" target="_blank" class="list-group-item list-group-item-action">Azure Security groups</a>
 
 				  <a href="https://www.alibabacloud.com/help/doc-detail/58746.htm" target="_blank" class="list-group-item list-group-item-action">Alibabacloud Security group</a>
 
 				  <a href="https://www.alibabacloud.com/help/doc-detail/58746.htm" target="_blank" class="list-group-item list-group-item-action">Alibabacloud Security group</a>
 
-				</div>	          	
+				</div>
 
 			</section>
 
 			</section>
 
 
 
           	<section class="section" id="donation_section">
 
           	<section class="section" id="donation_section">

+ 9 - 9
config/index_cn.html
Wyświetl plik 

@@ -11,7 +11,7 @@
 
 
 
   <body>
 
   <body>
 
     <nav class="navbar navbar-dark fixed-top bg-dark flex-md-nowrap p-0 shadow">
 
     <nav class="navbar navbar-dark fixed-top bg-dark flex-md-nowrap p-0 shadow">
 
-      <a class="navbar-brand col-sm-3 col-md-2 mr-0" href="./">OneinStack</a>
 
+      <a class="navbar-brand col-sm-3 col-md-2 mr-0" href="">OneinStack</a>
 
 
 
       <form class="w-100" action="https://oneinstack.com/qa/" method="GET" target="_blank">
 
       <form class="w-100" action="https://oneinstack.com/qa/" method="GET" target="_blank">
 
       	<input class="form-control form-control-dark w-100" type="text" placeholder="搜索OneinStack官网问答" aria-label="搜索OneinStack官网问答" name="qs">
 
       	<input class="form-control form-control-dark w-100" type="text" placeholder="搜索OneinStack官网问答" aria-label="搜索OneinStack官网问答" name="qs">
 
@@ -137,12 +137,12 @@
 
 	            <h1 class="h2" id="home">控制中心</h1>
 
 	            <h1 class="h2" id="home">控制中心</h1>
 
 	            <div class="btn-toolbar mb-2 mb-md-0">
 
 	            <div class="btn-toolbar mb-2 mb-md-0">
 
 	              <div class="btn-group mr-2">
 
 	              <div class="btn-group mr-2">
 
-	                <a class="btn btn-sm btn-outline-primary btn_prober" href="prober.php"><span data-feather="compass"></span> prober</a>
 
-	                <a class="btn btn-sm btn-outline-primary btn_tz" href="tz.php"><span data-feather="compass"></span> 探针</a>
 
-	                <a class="btn btn-sm btn-outline-info btn_phpinfo" href="phpinfo.php"><span data-feather="info"></span> phpinfo</a>
 
-	                <a class="btn btn-sm btn-outline-secondary btn_op" href="ocp.php"><span data-feather="cpu"></span> Opcache</a>
 
+	                <a class="btn btn-sm btn-outline-primary btn_prober" href="prober.php" target="_blank"><span data-feather="compass"></span> prober</a>
 
+	                <a class="btn btn-sm btn-outline-primary btn_tz" href="tz.php" target="_blank"><span data-feather="compass"></span> 探针</a>
 
+	                <a class="btn btn-sm btn-outline-info btn_phpinfo" href="phpinfo.php" target="_blank"><span data-feather="info"></span> phpinfo</a>
 
+	                <a class="btn btn-sm btn-outline-secondary btn_op" href="ocp.php" target="_blank"><span data-feather="cpu"></span> Opcache</a>
 
 	              </div>
 
 	              </div>
 
-	              <a class="btn btn-sm btn-outline-warning mr-2 btn_pma" href="phpMyAdmin/">
 
+	              <a class="btn btn-sm btn-outline-warning mr-2 btn_pma" href="phpMyAdmin/" target="_blank">
 
 	                <span data-feather="database"></span> phpMyAdmin
 
 	                <span data-feather="database"></span> phpMyAdmin
 
 	              </a>
 
 	              </a>
 
 	            </div>
 
 	            </div>
 
@@ -201,7 +201,7 @@
 
 			          <div class="card-body">
 
 			          <div class="card-body">
 
 			            <h1 class="card-title pricing-card-title">上线<small class="text-muted">运行</small></h1>
 
 			            <h1 class="card-title pricing-card-title">上线<small class="text-muted">运行</small></h1>
 
 			            <ul class="list-unstyled mt-3 mb-4">
 
 			            <ul class="list-unstyled mt-3 mb-4">
 
-			              <li><a href="phpMyAdmin/">phpMyAdmin</a></li>
 
+			              <li><a href="phpMyAdmin/" target="_blank">phpMyAdmin</a></li>
 
 			              <li>管理FTP账号 ./pureftpd_vhost.sh</li>
 
 			              <li>管理FTP账号 ./pureftpd_vhost.sh</li>
 
 			              <li>备份 ./backup_setup.sh</li>
 
 			              <li>备份 ./backup_setup.sh</li>
 
 			            </ul>
 
 			            </ul>
 
@@ -268,7 +268,7 @@
 
 				<p class="mt-4">HHVM:</p>
 
 				<p class="mt-4">HHVM:</p>
 
 				<div class="alert alert-primary" role="alert"><code>service supervisord {start|stop|status|restart|reload}</code></div>
 
 				<div class="alert alert-primary" role="alert"><code>service supervisord {start|stop|status|restart|reload}</code></div>
 
 				<p class="mt-4"><strong><span style="color: #ff0000;">注</span></strong>：hhvm进程交给supervisord管理，了解更多请访问《<a href="https://blog.linuxeye.com/408.html" target="_blank" rel="noopener noreferrer">Supervisor管理hhvm进程</a>》<br>
 
 				<p class="mt-4"><strong><span style="color: #ff0000;">注</span></strong>：hhvm进程交给supervisord管理，了解更多请访问《<a href="https://blog.linuxeye.com/408.html" target="_blank" rel="noopener noreferrer">Supervisor管理hhvm进程</a>》<br>
 
-				Apache:</p>
 
+				<p class="mt-4">Apache:</p>
 
 				<div class="alert alert-primary" role="alert"><code>service httpd {start|restart|stop}</code></div>
 
 				<div class="alert alert-primary" role="alert"><code>service httpd {start|restart|stop}</code></div>
 
 				<p class="mt-4">Tomcat:</p>
 
 				<p class="mt-4">Tomcat:</p>
 
 				<div class="alert alert-primary" role="alert"><code>service tomcat {start|stop|status|restart}</code></div>
 
 				<div class="alert alert-primary" role="alert"><code>service tomcat {start|stop|status|restart}</code></div>
 
@@ -303,7 +303,7 @@
 
 				  </ul>
 
 				  </ul>
 
 				</div>
 
 				</div>
 
 				<div class="list-group mt-5" style="width: 18rem;">
 
 				<div class="list-group mt-5" style="width: 18rem;">
 
-				  <a href="phpMyAdmin" class="list-group-item list-group-item-action active">
 
+				  <a class="list-group-item list-group-item-action active">
 
 				    云主机安全组端口开放教程
 
 				    云主机安全组端口开放教程
 
 				  </a>
 
 				  </a>
 
 				  <a href="https://oneinstack.com/docs/securitygroup/#11" target="_blank" class="list-group-item list-group-item-action">阿里云安全组端口</a>
 
 				  <a href="https://oneinstack.com/docs/securitygroup/#11" target="_blank" class="list-group-item list-group-item-action">阿里云安全组端口</a>

+ 2 - 0
include/memory.sh
Wyświetl plik 

@@ -8,6 +8,8 @@
 
 #       https://oneinstack.com
 
 #       https://oneinstack.com
 
 #       https://github.com/lj2007331/oneinstack
 
 #       https://github.com/lj2007331/oneinstack
 
 
 
+export LANG=en_US.UTF-8
 
+export LANGUAGE=en_US:en
 
 Mem=`free -m | awk '/Mem:/{print $2}'`
 
 Mem=`free -m | awk '/Mem:/{print $2}'`
 
 Swap=`free -m | awk '/Swap:/{print $2}'`
 
 Swap=`free -m | awk '/Swap:/{print $2}'`

+ 1 - 1
include/tengine.sh
Wyświetl plik 

@@ -27,7 +27,7 @@ Install_Tengine() {
 
 
 
   [ ! -d "${tengine_install_dir}" ] && mkdir -p ${tengine_install_dir}
 
   [ ! -d "${tengine_install_dir}" ] && mkdir -p ${tengine_install_dir}
 
   ./configure --prefix=${tengine_install_dir} --user=${run_user} --group=${run_user} --with-http_v2_module --with-http_ssl_module --with-http_gzip_static_module --with-http_realip_module --with-http_flv_module --with-http_mp4_module --with-http_concat_module=shared --with-http_sysguard_module=shared --with-openssl=../openssl-${openssl_ver} --with-pcre=../pcre-${pcre_ver} --with-pcre-jit --with-jemalloc ${nginx_modules_options}
 
   ./configure --prefix=${tengine_install_dir} --user=${run_user} --group=${run_user} --with-http_v2_module --with-http_ssl_module --with-http_gzip_static_module --with-http_realip_module --with-http_flv_module --with-http_mp4_module --with-http_concat_module=shared --with-http_sysguard_module=shared --with-openssl=../openssl-${openssl_ver} --with-pcre=../pcre-${pcre_ver} --with-pcre-jit --with-jemalloc ${nginx_modules_options}
 
-  make -j ${THREAD} && make install
 
+  make && make install
 
   if [ -e "${tengine_install_dir}/conf/nginx.conf" ]; then
 
   if [ -e "${tengine_install_dir}/conf/nginx.conf" ]; then
 
     popd
 
     popd
 
     rm -rf pcre-${pcre_ver}
 
     rm -rf pcre-${pcre_ver}

+ 1 - 1
include/upgrade_web.sh
Wyświetl plik 

@@ -116,7 +116,7 @@ Upgrade_Tengine() {
 
     export LUAJIT_LIB=/usr/local/lib
 
     export LUAJIT_LIB=/usr/local/lib
 
     export LUAJIT_INC=/usr/local/include/luajit-2.1
 
     export LUAJIT_INC=/usr/local/include/luajit-2.1
 
     ./configure ${tengine_configure_args}
 
     ./configure ${tengine_configure_args}
 
-    make -j ${THREAD}
 
+    make
 
     if [ -f "objs/nginx" ]; then
 
     if [ -f "objs/nginx" ]; then
 
       /bin/mv ${tengine_install_dir}/sbin/nginx{,`date +%m%d`}
 
       /bin/mv ${tengine_install_dir}/sbin/nginx{,`date +%m%d`}
 
       /bin/mv ${tengine_install_dir}/sbin/dso_tool{,`date +%m%d`}
 
       /bin/mv ${tengine_install_dir}/sbin/dso_tool{,`date +%m%d`}

+ 8 - 8
versions.txt
Wyświetl plik 

@@ -5,8 +5,8 @@ tengine_ver=2.2.2
 
 openresty_ver=1.13.6.2
 
 openresty_ver=1.13.6.2
 
 openssl_ver=1.0.2p
 
 openssl_ver=1.0.2p
 
 
 
-tomcat9_ver=9.0.11
 
-tomcat8_ver=8.5.33
 
+tomcat9_ver=9.0.12
 
+tomcat8_ver=8.5.34
 
 tomcat7_ver=7.0.90
 
 tomcat7_ver=7.0.90
 
 tomcat6_ver=6.0.53
 
 tomcat6_ver=6.0.53
 
 
 
@@ -25,11 +25,11 @@ mysql55_ver=5.5.61
 
 
 
 mariadb103_ver=10.3.9
 
 mariadb103_ver=10.3.9
 
 mariadb102_ver=10.2.17
 
 mariadb102_ver=10.2.17
 
-mariadb101_ver=10.1.35
 
+mariadb101_ver=10.1.36
 
 mariadb100_ver=10.0.36
 
 mariadb100_ver=10.0.36
 
 mariadb55_ver=5.5.61
 
 mariadb55_ver=5.5.61
 
 
 
-percona57_ver=5.7.22-22
 
+percona57_ver=5.7.23-23
 
 percona56_ver=5.6.41-84.1
 
 percona56_ver=5.6.41-84.1
 
 percona55_ver=5.5.61-38.13
 
 percona55_ver=5.5.61-38.13
 
 
 
@@ -46,10 +46,10 @@ jdk17_ver=1.7.0_80
 
 jdk16_ver=1.6.0_45
 
 jdk16_ver=1.6.0_45
 
 
 
 # PHP
 
 # PHP
 
-php72_ver=7.2.9
 
-php71_ver=7.1.21
 
-php70_ver=7.0.31
 
-php56_ver=5.6.37
 
+php72_ver=7.2.10
 
+php71_ver=7.1.22
 
+php70_ver=7.0.32
 
+php56_ver=5.6.38
 
 php55_ver=5.5.38
 
 php55_ver=5.5.38
 
 php54_ver=5.4.45
 
 php54_ver=5.4.45
 
 php53_ver=5.3.29
 
 php53_ver=5.3.29