bugfix: set configuration file to avoid using a wrong one (#220)

apache · Jul 8, 2019 · 5fccb78 · 5fccb78
1 parent 9de2107
commit 5fccb78
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -52,13 +52,13 @@ init:
 run:
 	mkdir -p logs
 	mkdir -p /tmp/cores/
-	$$(which openresty) -p $$PWD/
+	$$(which openresty) -p $$PWD/ -c $$PWD/conf/nginx.conf
 
 
 ### stop:         Stop the apisix server
 .PHONY: stop
 stop:
-	$$(which openresty) -p $$PWD/ -s stop
+	$$(which openresty) -p $$PWD/ -c $$PWD/conf/nginx.conf -s stop
 
 
 ### clean:        Remove generated files
@@ -70,7 +70,7 @@ clean:
 ### reload:       Reload the apisix server
 .PHONY: reload
 reload:
-	$$(which openresty) -p $$PWD/ -s reload
+	$$(which openresty) -p $$PWD/  -c $$PWD/conf/nginx.conf -s reload
 
 
 ### install:      Install the apisix

diff --git a/bin/apisix b/bin/apisix
@@ -331,8 +331,8 @@ function _M.start(...)
     init(...)
     init_etcd(...)
 
-    -- print([[openresty -p ]] .. apisix_home)
-    os.execute([[openresty -p ]] .. apisix_home)
+    -- print([[openresty -p ]] .. apisix_home .. [[ -c ]] .. apisix_home .. "/conf/nginx.conf")
+    os.execute([[openresty -p ]] .. apisix_home .. [[ -c ]] .. apisix_home .. "/conf/nginx.conf")
 end
 
 function _M.stop()