1. Adjust the directory hierarchy

2. Fix the compile issue
Change-Id: Ibf10c83104e5e673bc797013799861426cd950ce
Signed-off-by: HuabingZhao <zhao.huabing@zte.com.cn>

1 files changed, 0 insertions, 57 deletions

diff --git a/openresty-ext/src/assembly/resources/openresty/nginx/conf/nginx.conf b/openresty-ext/src/assembly/resources/openresty/nginx/conf/nginx.conf
deleted file mode 100644
index 5c524fc..0000000
--- a/openresty-ext/src/assembly/resources/openresty/nginx/conf/nginx.conf
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#user  nobody;
-worker_processes  auto;
-worker_rlimit_nofile 50000; 
-
-error_log  logs/error.log  warn;
-pid        logs/nginx.pid;
-
-events {
-    #linux下打开提高性能
-    #use epoll; 
-    worker_connections  2048;
-    multi_accept on; 
-}
-
-http {
-    server_tokens off;
-    include mime.types;
-    default_type text/html; 
-
-    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-    #                  '$status $body_bytes_sent "$http_referer" '
-    #                  '"$http_user_agent" "$http_x_forwarded_for"';
-
-    #access_log  logs/access.log  main;
-    access_log off; 
-	
-    sendfile        on;
-    tcp_nopush     on;
-	
-    keepalive_timeout  120s;
-	
-    gzip  on;
-
-    include ../msb-enabled/*.conf;
-	include ../sites-enabled/*.conf;
-	include ../sites-enabled-mount/*.conf;
-}
-
-stream {
-    include ../stream-enabled/*;
-}