From 76692ecd8e5a528c8a30321bc1e258b49666b731 Mon Sep 17 00:00:00 2001 From: Janko Date: Thu, 17 Oct 2019 21:44:01 +0800 Subject: [PATCH 1/2] change: update MySQL file in Makefile from v0.7 to v0.8. --- Makefile | 4 ++-- README.md | 10 +++------- README_zh.md | 10 +++------- orange/version.lua | 2 +- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 8ba04db2..4644ab73 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ else endif $(INSTALL) conf/nginx.conf.example conf/nginx.conf $(INSTALL) conf/orange.conf.example conf/orange.conf - $(INSTALL) install/orange-v0.7.0.sql conf/orange-v0.7.0.sql + $(INSTALL) install/orange-v0.8.0.sql conf/orange-v0.8.0.sql ### install: Install the Orange @@ -41,7 +41,7 @@ install: $(INSTALL) conf/nginx.conf.example /usr/local/orange/conf/nginx.conf $(INSTALL) conf/orange.conf.example /usr/local/orange/conf/orange.conf $(INSTALL) conf/mime.types /usr/local/orange/conf/mime.types - $(INSTALL) install/orange-v0.7.0.sql /usr/local/orange/conf/orange-v0.7.0.sql + $(INSTALL) install/orange-v0.8.0.sql /usr/local/orange/conf/orange-v0.8.0.sql $(INSTALL) -d $(INST_LUADIR)/orange/dashboard $(INSTALL) -d $(INST_LUADIR)/orange/orange diff --git a/README.md b/README.md index aae6fcda..be56d66a 100644 --- a/README.md +++ b/README.md @@ -21,10 +21,6 @@ System dependencies (`openresty`, `resty-cli`, `luarocks`, etc.) necessary to in Check the [official documentation](https://github.com/sumory/lor) for `Lor Framework` or execute the following command. - - Orange v0.6.1 and versions before v0.6.1 are compatible with lor v0.2.* - - - Orange v0.6.2+ is compatible with lor v0.3.0+ - ```bash git clone https://github.com/sumory/lor.git cd lor @@ -38,7 +34,7 @@ curl -Lo install.sh https://raw.githubusercontent.com/orlabs/orange/master/insta sudo sh install.sh ``` -After the installation process is completed, the output message `orange 0.7-0 is now installed in /usr/local/orange/deps (license: MIT)` indicates that the installation was successful. +After the installation process is completed, the output message `orange 0.8-0 is now installed in /usr/local/orange/deps (license: MIT)` indicates that the installation was successful. #### 4) Import MySQL @@ -46,7 +42,7 @@ Requirements: MySQL Version 5.5+ - Login to the `MySQL` client, create an `orange` database. - - Import the data table (`/usr/local/orange/conf/orange-v0.7.0.sql`). + - Import the data table (`/usr/local/orange/conf/orange-v0.8.0.sql`). - Modify the `Orange` configuration file (`/usr/local/orange/conf/orange.conf`) `MySQL` related configuration. @@ -77,7 +73,7 @@ cd orange sodu make dev ``` -After the installation process is completed, the output message `Stopping after installing dependencies for orange 0.7-0` indicates that the installation was successful. +After the installation process is completed, the output message `Stopping after installing dependencies for orange-master 1.0-0` indicates that the installation was successful. #### 3) Import MySQL diff --git a/README_zh.md b/README_zh.md index b2146887..876fd607 100644 --- a/README_zh.md +++ b/README_zh.md @@ -26,10 +26,6 @@ 查看`Lor Framework`[官方文档](https://github.com/sumory/lor)或执行以下命令。 - - 若使用的 `Orange` 版本低于 `v0.6.2` 则应安装 `lor v0.2.*` 版本。 - - - 若使用的 `Orange` 版本高于或等于 `v0.6.2` 则应安装 `lor v0.3.0+` 版本。 - ```bash git clone https://github.com/sumory/lor.git cd lor @@ -43,7 +39,7 @@ curl -Lo install.sh https://raw.githubusercontent.com/orlabs/orange/master/insta sudo sh install.sh ``` -安装过程结束后，输出消息 `orange 0.7-0 is now installed in /usr/local/orange/deps (license: MIT)` 即说明安装成功。 +安装过程结束后，输出消息 `orange 0.8-0 is now installed in /usr/local/orange/deps (license: MIT)` 即说明安装成功。 #### 4) 导入 MySQL @@ -51,7 +47,7 @@ sudo sh install.sh - 登录到 `MySQL` 客户端，创建一个 `orange` 数据库。 - - 导入数据表（`/usr/local/orange/conf/orange-v0.7.0.sql`）。 + - 导入数据表（`/usr/local/orange/conf/orange-v0.8.0.sql`）。 - 修改`Orange`配位置文件中（`/usr/local/orange/conf/orange.conf`）`MySQL`相关配置。 @@ -82,7 +78,7 @@ cd orange sudo make dev ``` -安装过程结束后，输出消息 `Stopping after installing dependencies for orange 0.7-0` 即说明安装成功。 +安装过程结束后，输出消息 `Stopping after installing dependencies for orange-master 1.0-0` 即说明安装成功。 #### 3) 导入 MySQL diff --git a/orange/version.lua b/orange/version.lua index 9d45804d..b1a3fb20 100644 --- a/orange/version.lua +++ b/orange/version.lua @@ -1,2 +1,2 @@ -local version = "0.7.0" +local version = "0.8.0" return version From 689212dff133aec64d51b6af34c2d5763e77a270 Mon Sep 17 00:00:00 2001 From: Janko Date: Thu, 17 Oct 2019 21:54:59 +0800 Subject: [PATCH 2/2] change: delete invalid CLI script. --- start.sh | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 start.sh diff --git a/start.sh b/start.sh deleted file mode 100644 index b5a5617e..00000000 --- a/start.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash - -current_path=`pwd` -pid="" - -if [ -f $current_path/logs/nginx.pid ] -then - pid=`cat $current_path/logs/nginx.pid` -fi - -if [ ! -f ./conf/nginx.conf ] || [ ! -f ./conf/orange.conf ] -then - make init-config -fi - -if [ "$pid" = "" ] -then - echo "start orange.." -else - echo "kill "$pid - #kill -s QUIT $pid - nginx -p `pwd` -c ./conf/nginx.conf -s stop - echo "restart orange.." -fi - -mkdir -p logs -nginx -p `pwd` -c ./conf/nginx.conf