Merge branch 'master' of https://github.com/Tinywan/lua_project_v0.01 into company

Author: Tinywan

README.md

@@ -80,30 +80,48 @@
         └── js
 ```
 ## Openresty Installation
-+   Prerequisites：`apt-get install libreadline-dev libncurses5-dev libpcre3-dev libssl-dev perl make build-essential`
++   Prerequisites：  
+    ```
+    apt-get install libreadline-dev libncurses5-dev libpcre3-dev \
+    libssl-dev perl make build-essential
+    ```
 +   Building：
     ```bash
-    wget https://openresty.org/download/openresty-1.11.2.1.tar.gz
+    wget https://openresty.org/download/openresty-1.11.2.3.tar.gz
     tar xvf openresty-1.11.2.1.tar.gz
     cd openresty-1.11.2.1
     ./configure --prefix=/opt/openresty \
-                --with-pcre-jit \
-                --with-ipv6 \
+                --with-luajit \
                 --without-http_redis2_module \
                 --with-http_iconv_module \
-                --with-http_postgres_module \
-                -j2
-    make
+                --with-http_postgres_module 
+    make -j2
     sudo make install
     ```
-    
++   error
+    +   错误1：`you need to have ldconfig in your PATH env when enabling luajit.`
+    +   解决办法：
+        ```bash
+        sudo apt-get install luajit
+        whereis luajit
+        luajit: /usr/bin/luajit /usr/share/man/man1/luajit.1.gz
+
+        ./configure --prefix=/opt/openresty \
+                    --with-luajit=/usr/bin/luajit \
+                    --without-http_redis2_module \
+                    --with-http_iconv_module \
+                    --with-http_postgres_module 
+        make -j2
+        sudo make install
+        ```
 ## nginx.conf, the Nginx web server configuration
 
 ```bash
 user  www www;
 worker_processes  8;
 
 pid        logs/nginx.pid;
+error_log log/error.log error;
 worker_rlimit_nofile 204800;
 
 events {

conf/domains/nginx_demo.conf

@@ -14,8 +14,6 @@ server {
     listen       8080;
     server_name  localhost;
     index  index.php index.html index.htm;
-    #access_log  /mnt/hgfs/Linux-Share/Lua/lua_project_v0.01/logs/demo_access.log;
-    error_log /mnt/hgfs/Linux-Share/Lua/lua_project_v0.01/logs/demo_error.log error;
     set $project_path /mnt/hgfs/Linux-Share/Lua/;  # 定义项目根目录，如项目放在/home/www/
     set $web_root "${project_path}lua_project_v0.01/template/websocket";
 

conf/domains/nginx_index.conf

@@ -5,8 +5,6 @@ server {
     charset utf8;
     default_type text/html;
     index  chatroom.html index.htm;
-    #access_log  /mnt/hgfs/Linux-Share/Lua/lua_project_v0.01/logs/index_access.log;
-    error_log /mnt/hgfs/Linux-Share/Lua/lua_project_v0.01/logs/index_error.log error;
 
     #加载模板文件
     set $template_root "/mnt/hgfs/Linux-Share/Lua/lua_project_v0.01/template";

conf/domains/nginx_live.conf

@@ -9,8 +9,6 @@ server {
     charset utf8;
     default_type text/html;
     index  chatroom.html index.htm;
-    #access_log  /mnt/hgfs/Linux-Share/Lua/lua_project_v0.01/logs/live_access.log;
-    error_log /mnt/hgfs/Linux-Share/Lua/lua_project_v0.01/logs/live_error.log error;
 
     #加载直播模板
     set $project_path /mnt/hgfs/Linux-Share/Lua/;  # 定义项目根目录，如项目放在/home/www/

conf/domains/nginx_product.conf

@@ -7,8 +7,6 @@ server {
     charset gbk;
     index  chatroom.html index.htm index.phtm;
     set $project_path /mnt/hgfs/Linux-Share/Lua/;
-    access_log  /mnt/hgfs/Linux-Share/Lua/lua_project_v0.01/logs/product_access.log;
-    error_log /mnt/hgfs/Linux-Share/Lua/lua_project_v0.01/logs/product_error.log error;
 
     #加载模板文件
     set $project_path /mnt/hgfs/Linux-Share/Lua/;  # 定义项目根目录，如项目放在/home/www/

conf/domains/upstream.conf

@@ -4,8 +4,6 @@ server {
     server_name  127.0.0.1;
     charset utf8;
     default_type application/json;
-    #access_log  /mnt/hgfs/Linux-Share/Lua/lua_project_v0.01/logs/upstream_access.log;
-    #error_log /mnt/hgfs/Linux-Share/Lua/lua_project_v0.01/logs/upstream_error.log error;
 
     proxy_set_header Host $http_host;
     proxy_set_header X-Forwarded-Port $server_port;

conf/domains/waf.conf

@@ -5,8 +5,6 @@ server {
     listen       8082;
     server_name  localhost;
     index  index.php chatroom.html index.htm;
-    #access_log  /mnt/hgfs/Linux-Share/Lua/lua_project_v0.01/logs/waf_access.log;
-    #error_log /mnt/hgfs/Linux-Share/Lua/lua_project_v0.01/logs/waf_error.log error;
 
     set $web_root /mnt/hgfs/Linux-Share/Lua/lua_project_v0.01/template/waf;
     root $web_root;

conf/nginx.conf

@@ -1,6 +1,7 @@
 user tinywan;
 worker_processes  8;
 pid        logs/nginx.pid;
+error_log log/error.log error;
 events {
     use epoll;
     worker_connections  1024;