diff --git a/rootfs/etc/nginx/lua/nginx/ngx_conf_log_block.lua b/rootfs/etc/nginx/lua/nginx/ngx_conf_log_block.lua index 795f0973e..021952b74 100644 --- a/rootfs/etc/nginx/lua/nginx/ngx_conf_log_block.lua +++ b/rootfs/etc/nginx/lua/nginx/ngx_conf_log_block.lua @@ -1,6 +1,5 @@ local balancer = require("balancer") local monitor = require("monitor") -local plugins = require("plugins") local luaconfig = ngx.shared.luaconfig local enablemetrics = luaconfig:get("enablemetrics") @@ -10,5 +9,4 @@ balancer.log() if enablemetrics then monitor.call() -end -plugins.run() \ No newline at end of file +end \ No newline at end of file diff --git a/rootfs/etc/nginx/lua/nginx/ngx_conf_srv_body_filter.lua b/rootfs/etc/nginx/lua/nginx/ngx_conf_srv_body_filter.lua deleted file mode 100644 index 881098fa2..000000000 --- a/rootfs/etc/nginx/lua/nginx/ngx_conf_srv_body_filter.lua +++ /dev/null @@ -1,2 +0,0 @@ -local plugins = require("plugins") -plugins.run() \ No newline at end of file diff --git a/rootfs/etc/nginx/lua/nginx/ngx_conf_srv_hdr_filter.lua b/rootfs/etc/nginx/lua/nginx/ngx_conf_srv_hdr_filter.lua index 99c661f24..311a9b433 100644 --- a/rootfs/etc/nginx/lua/nginx/ngx_conf_srv_hdr_filter.lua +++ b/rootfs/etc/nginx/lua/nginx/ngx_conf_srv_hdr_filter.lua @@ -1,4 +1,2 @@ local lua_ingress = require("lua_ingress") -local plugins = require("plugins") -lua_ingress.header() -plugins.run() +lua_ingress.header() \ No newline at end of file diff --git a/rootfs/etc/nginx/lua/ngx_conf_init.lua b/rootfs/etc/nginx/lua/ngx_conf_init.lua index d788e1cf3..cb4ba8e28 100644 --- a/rootfs/etc/nginx/lua/ngx_conf_init.lua +++ b/rootfs/etc/nginx/lua/ngx_conf_init.lua @@ -41,17 +41,6 @@ local function initialize_ingress(statusport, enablemetrics, ocsp, ingress) certificate = res certificate.is_ocsp_stapling_enabled = ocsp end - - ok, res = pcall(require, "plugins") - if not ok then - error("require failed: " .. tostring(res)) - else - plugins = res - end - - -- TODO: Re-enable 3rd party plugins - --plugins.init({ {{ range $idx, $plugin := $cfg.Plugins }}{{ if $idx }},{{ end }}{{ $plugin | quote }}{{ end }} }) - plugins.init({}) end return { initialize_ingress = initialize_ingress } \ No newline at end of file diff --git a/rootfs/etc/nginx/lua/ngx_conf_init_worker.lua b/rootfs/etc/nginx/lua/ngx_conf_init_worker.lua index c92b00bcd..68531537a 100644 --- a/rootfs/etc/nginx/lua/ngx_conf_init_worker.lua +++ b/rootfs/etc/nginx/lua/ngx_conf_init_worker.lua @@ -1,14 +1,12 @@ local function initialize_worker(enablemetrics, monitorbatchsize) local lua_ingress = require("lua_ingress") local balancer = require("balancer") - local plugins = require("plugins") local monitor = require("monitor") lua_ingress.init_worker() balancer.init_worker() if enablemetrics then monitor.init_worker(monitorbatchsize) end - plugins.run() end return { initialize_worker = initialize_worker } \ No newline at end of file diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl index e1a45586c..44e595739 100644 --- a/rootfs/etc/nginx/template/nginx.tmpl +++ b/rootfs/etc/nginx/template/nginx.tmpl @@ -1141,40 +1141,7 @@ stream { header_filter_by_lua_file /etc/nginx/lua/nginx/ngx_conf_srv_hdr_filter.lua; -<<<<<<< HEAD - header_filter_by_lua_block { - lua_ingress.header() - } - - log_by_lua_block { - balancer.log() - {{ if $all.EnableMetrics }} - monitor.call() - {{ end }} - } -||||||| parent of b65dae6b8 (Remove inline lua script from template) - header_filter_by_lua_block { - lua_ingress.header() - plugins.run() - } - - body_filter_by_lua_block { - plugins.run() - } - - log_by_lua_block { - balancer.log() - {{ if $all.EnableMetrics }} - monitor.call() - {{ end }} - - plugins.run() - } -======= - body_filter_by_lua_file /etc/nginx/lua/nginx/ngx_conf_srv_body_filter.lua; - log_by_lua_file /etc/nginx/lua/nginx/ngx_conf_log_block.lua; ->>>>>>> b65dae6b8 (Remove inline lua script from template) {{ if not $location.Logs.Access }} access_log off;