change path for lua code,

from now on root /
- html in /html
- conf in /conf
- lua in /lua

Author: danielstaleiny

docker-compose.yml

@@ -77,7 +77,7 @@ services:
   #   volumes:
   #     - "./openresty/nginx:/usr/local/openresty/nginx/conf"
   #     - "./openresty/html:/usr/local/openresty/nginx/html"
-  #     - "./openresty/lua:/usr/local/openresty/lualib/user_code"
+  #     - "./openresty/lua:/usr/local/openresty/nginx/lua"
   #   depends_on:
   #     - db
 

openresty/Dockerfile

@@ -1,5 +1,5 @@
 FROM openresty/openresty:stretch
 
 COPY nginx /usr/local/openresty/nginx/conf
-COPY html /usr/local/openresty/nginx
-COPY lua /usr/local/openresty/lualib/user_code
+COPY html /usr/local/openresty/nginx/html
+COPY lua /usr/local/openresty/nginx/lua

openresty/nginx/nginx.conf

@@ -18,8 +18,8 @@ events {
 http {
 
     # set search paths for pure Lua external libraries (';;' is the default path):
-    lua_package_path '${prefix}../lualib/user_code/?.lua;;';
-    init_by_lua_file '../lualib/user_code/init_phase.lua';
+    lua_package_path '${prefix}lua/?.lua;;';
+    init_by_lua_file 'lua/init_phase.lua';
 
     # a shorter log format for development
     log_format development '[$time_local] "$request" $status $body_bytes_sent "$request_time ms"';

openresty/nginx/rest.conf

@@ -4,7 +4,7 @@ set $rest_prefix "/api";
 location /api/rpc/refresh_token {
     if ($cookie_REFRESHTOKEN != ""){
         more_set_input_headers 'Refresh-Token: $cookie_REFRESHTOKEN';
-        rewrite_body_with_refresh_token '../lualib/user_code/internal_rest_refresh_token.lua';
+        rewrite_body_with_refresh_token 'lua/internal_rest_refresh_token.lua';
     }
 
     rewrite ^/api/(.*)$ /internal/api/$1;
@@ -26,9 +26,9 @@ location /internal/api/ {
     internal;
     default_type  application/json;
 
-    rewrite_by_lua_file '../lualib/user_code/internal_rest_rewrite_phase.lua';
-    header_filter_by_lua_file '../lualib/user_code/internal_rest_header_filter_phase.lua';
-    body_filter_by_lua_file '../lualib/user_code/internal_rest_body_filter_phase.lua';
+    rewrite_by_lua_file 'lua/internal_rest_rewrite_phase.lua';
+    header_filter_by_lua_file 'lua/internal_rest_header_filter_phase.lua';
+    body_filter_by_lua_file 'lua/internal_rest_body_filter_phase.lua';
 
     proxy_set_header  Accept-Encoding  ""; #force postgrest not to gzip the output
     proxy_set_header  Connection ""; #optimise communication with upstream (keep alive)