Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change: update MySQL file in Makefile from v0.7 to v0.8. #307

Merged
merged 2 commits into from
Oct 18, 2019
Merged

change: update MySQL file in Makefile from v0.7 to v0.8. #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90088ee
fix readme
wujunze Oct 17, 2019
76692ec
change: update MySQL file in Makefile from v0.7 to v0.8.
shuaijinchao Oct 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
12 changes: 4 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<a href="./README_zh.md" style="font-size:13px">中文</a> | <a href="./README.md" style="font-size:13px">English</a> | <a href="http://orange.sumory.com" style="font-size:13px">Website</a>


A Gateway based on OpenResty(Nginx+lua) for API Monitoring and Management.
A Gateway based on OpenResty(Nginx + Lua) for API Monitoring and Management.


## Install & Usages
Expand All @@ -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
Expand All @@ -38,15 +34,15 @@ 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

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.

Expand Down Expand Up @@ -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

Expand Down
10 changes: 3 additions & 7 deletions README_zh.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -43,15 +39,15 @@ 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

要求：`MySQL`版本 5.5+

- 登录到 `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`相关配置。

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion orange/version.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
local version = "0.7.0"
local version = "0.8.0"
return version