commit 0d36723e6f286c148593966e5112f5c3e71e567b
author YuanSheng Wang <membphis@gmail.com> Fri Sep 27 10:16:29 2019 +0800
committer GitHub <noreply@github.com> Fri Sep 27 10:16:29 2019 +0800
tree 1ce33ecde4b7474f1bd8d1dc1b3cd8f9af670107
parent 91e54ab3050468c6f1310bdbd44d81eea1924b32

change(dashboard): use `/apisix/dashboard` to login dashboard. (#611)

change(CLI): exported new argument of `error_log.level`.
change(CLI): enabled dashboard when use an independent admin port.

bin/apisix

diff --git a/bin/apisix b/bin/apisix
index 1299ceb..497c579 100755
--- a/bin/apisix
+++ b/bin/apisix
@@ -64,7 +64,7 @@
 worker_cpu_affinity auto;
 {% end %}
 
-error_log logs/error.log error;
+error_log logs/error.log {*error_log.level or "error"*};
 pid logs/nginx.pid;
 
 worker_rlimit_nofile 20480;
@@ -208,6 +208,24 @@
                 apisix.http_admin()
             }
         }
+
+        location /apisix/dashboard {
+            index index.html;
+            {%if allow_admin then%}
+                {% for _, allow_ip in ipairs(allow_admin) do %}
+                allow {*allow_ip*};
+                {% end %}
+                deny all;
+            {%end%}
+
+            alias dashboard/;
+
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Real-PORT $remote_port;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+            try_files $uri $uri/ /index.html;
+        }
     }
     {% end %}
 
@@ -244,13 +262,8 @@
                 apisix.http_admin()
             }
         }
-        {% end %}
 
-        ssl_certificate_by_lua_block {
-            apisix.http_ssl_phase()
-        }
-
-        location /apisix/dashboard/ {
+        location /apisix/dashboard {
             index index.html;
             {%if allow_admin then%}
                 {% for _, allow_ip in ipairs(allow_admin) do %}
@@ -267,6 +280,11 @@
 
             try_files $uri $uri/ /index.html;
         }
+        {% end %}
+
+        ssl_certificate_by_lua_block {
+            apisix.http_ssl_phase()
+        }
 
         location / {
             set $upstream_scheme             'http';
@@ -444,6 +462,7 @@
         apisix_lua_home = apisix_home,
         with_module_status = with_module_status,
         node_ssl_listen = 9443,     -- default value
+        error_log = {level = "warn"},
     }
     for k,v in pairs(yaml_conf.apisix) do
         sys_conf[k] = v

conf/config.yaml

diff --git a/conf/config.yaml b/conf/config.yaml
index 4cd13e8..3a3ad6b 100644
--- a/conf/config.yaml
+++ b/conf/config.yaml
@@ -31,6 +31,8 @@
   #     - 9211
   dns_resolver:                   # use 114.114.114.114 as default DNS resolver, disable IPv6 and enable local DNS.
     - 114.114.114.114
+  error_log:
+    level: warn
 
 etcd:
   host: "http://127.0.0.1:2379"   # etcd address

conf/nginx.conf

diff --git a/conf/nginx.conf b/conf/nginx.conf
index dc8e091..e399ee4 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -106,7 +106,7 @@
             apisix.http_ssl_phase()
         }
 
-        location /apisix/dashboard/ {
+        location /apisix/dashboard {
             index index.html;
 
             alias dashboard/;