From ece78e2f0479c4551d519cd877970ce3061966ad Mon Sep 17 00:00:00 2001 From: Ned Wright Date: Wed, 13 Dec 2023 17:36:53 +0000 Subject: [PATCH 1/2] Updating the installation script --- nodes/nginx_attachment/install-nginx-attachment.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nodes/nginx_attachment/install-nginx-attachment.sh b/nodes/nginx_attachment/install-nginx-attachment.sh index 406a145..94734d2 100755 --- a/nodes/nginx_attachment/install-nginx-attachment.sh +++ b/nodes/nginx_attachment/install-nginx-attachment.sh @@ -53,14 +53,17 @@ run_installation() [ -f /etc/nginx/template/nginx.tmpl ] && sed -i -e '/load_module.*ngx_cp_attachment_module.so;/d' /etc/nginx/template/nginx.tmpl || echo [ -f /usr/local/share/lua/5.1/kong/templates/nginx.lua ] && sed -i -e '/load_module.*ngx_cp_attachment_module.so;/d' /usr/local/share/lua/5.1/kong/templates/nginx.lua || echo [ -f /usr/local/share/lua/5.1/kong/templates/nginx.lua ] && sed -i -e '/cp_worker_processes/d'/usr/local/share/lua/5.1/kong/templates/nginx.lua || echo + [ -f /usr/local/apisix/apisix/cli/ngx_tpl.lua ] && sed -i -e '/load_module.*ngx_cp_attachment_module.so;/d' /usr/local/apisix/apisix/cli/ngx_tpl.lua || echo [ -f /etc/nginx/nginx.conf ] && sed -i 1i'load_module /usr/lib/nginx/modules/ngx_cp_attachment_module.so;' /etc/nginx/nginx.conf || echo [ -f /etc/nginx/template/nginx.tmpl ] && sed -i 1i'load_module /usr/lib/nginx/modules/ngx_cp_attachment_module.so;' /etc/nginx/template/nginx.tmpl || echo - [ -f /usr/local/share/lua/5.1/kong/templates/nginx.lua ] && sed -i 's|return [[|return [[\\nload_module /usr/lib64/nginx/modules/ngx_cp_attachment_module.so;|g' /usr/local/share/lua/5.1/kong/templates/nginx.lua || echo + [ -f /usr/local/share/lua/5.1/kong/templates/nginx.lua ] && sed -i 's|return \[\[|return \[\[\nload_module /usr/lib/nginx/modules/ngx_cp_attachment_module.so;|g' /usr/local/share/lua/5.1/kong/templates/nginx.lua || echo [ -f /usr/local/share/lua/5.1/kong/templates/nginx.lua ] && sed -i 's|http {|http {\ncp_worker_processes ${{nginx_worker_processes}};|g' /usr/local/share/lua/5.1/kong/templates/nginx.lua || echo + [ -f /usr/local/apisix/apisix/cli/ngx_tpl.lua ] && sed -i 's|return \[\=\[|return \[\=\[\nload_module /usr/lib/nginx/modules/ngx_cp_attachment_module.so;|' /usr/local/apisix/apisix/cli/ngx_tpl.lua || echo command -v nginx > /dev/null && nginx -s reload command -v kong > /dev/null && kong restart + command -v apisix > /dev/null && apisix reload cp_print "Installation completed successfully." $FORCE_STDOUT } From e456d02d2c62f8944290ee5b39ef2246ada014bc Mon Sep 17 00:00:00 2001 From: Ned Wright Date: Tue, 19 Dec 2023 14:12:59 +0000 Subject: [PATCH 2/2] Add mkdir commands --- nodes/nginx_attachment/install-nginx-attachment.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nodes/nginx_attachment/install-nginx-attachment.sh b/nodes/nginx_attachment/install-nginx-attachment.sh index 94734d2..78de72f 100755 --- a/nodes/nginx_attachment/install-nginx-attachment.sh +++ b/nodes/nginx_attachment/install-nginx-attachment.sh @@ -46,6 +46,8 @@ run_installation() cp_exec "cp lib/libosrc_nginx_attachment_util.so /usr/lib64/libosrc_nginx_attachment_util.so" cp_exec "cp lib/libosrc_shmem_ipc.so /usr/lib/libosrc_shmem_ipc.so" cp_exec "cp lib/libosrc_shmem_ipc.so /usr/lib64/libosrc_shmem_ipc.so" + cp_exec "mkdir -p /usr/lib/nginx/modules" + cp_exec "mkdir -p /usr/lib64/nginx/modules" cp_exec "cp lib/libngx_module.so /usr/lib/nginx/modules/ngx_cp_attachment_module.so" cp_exec "cp lib/libngx_module.so /usr/lib64/nginx/modules/ngx_cp_attachment_module.so"