From a7558d713c94ad84ebc6cdb494f098c2924d91a6 Mon Sep 17 00:00:00 2001 From: "Feng Han @forestthebug" <94027156+forestthebug@users.noreply.github.com> Date: Mon, 20 Feb 2023 12:05:56 +0800 Subject: [PATCH 1/3] feat: support lua-resty-ldap, removing openldap Related issue: https://github.com/api7/lua-resty-ldap/issues/11 --- package-apisix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-apisix.sh b/package-apisix.sh index fffa6fae5..8a392bbf3 100755 --- a/package-apisix.sh +++ b/package-apisix.sh @@ -7,7 +7,7 @@ dist=$(cat /tmp/dist) ARCH=${ARCH:-`(uname -m | tr '[:upper:]' '[:lower:]')`} # Determine the dependencies -dep_ldap="openldap-devel" +dep_ldap="lua-resty-ldap" if [ "$PACKAGE_TYPE" == "deb" ] then # the pkg contains the so library could be libldap-2.5 or libldap-2.4-2 From 202e9b85bc8169256310a7591101d9bca39367d3 Mon Sep 17 00:00:00 2001 From: "Feng Han @forestthebug" <94027156+forestthebug@users.noreply.github.com> Date: Mon, 20 Feb 2023 12:34:22 +0800 Subject: [PATCH 2/3] Update install-common.sh --- utils/install-common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/install-common.sh b/utils/install-common.sh index c5b21a693..7a6fce777 100755 --- a/utils/install-common.sh +++ b/utils/install-common.sh @@ -53,7 +53,7 @@ install_openresty_deb() { install_openresty_rpm() { # install openresty and openssl111 yum-config-manager --add-repo https://openresty.org/package/centos/openresty.repo - yum install -y openresty openresty-openssl111-devel pcre pcre-devel openldap-devel + yum install -y openresty openresty-openssl111-devel pcre pcre-devel } install_luarocks() { From bf4551e3052f54dcb8731e9c4844cf7fa60996ea Mon Sep 17 00:00:00 2001 From: "Feng Han @forestthebug" <94027156+forestthebug@users.noreply.github.com> Date: Mon, 20 Feb 2023 12:36:09 +0800 Subject: [PATCH 3/3] Update install-common.sh --- utils/install-common.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/install-common.sh b/utils/install-common.sh index 7a6fce777..c106feaa3 100755 --- a/utils/install-common.sh +++ b/utils/install-common.sh @@ -23,6 +23,10 @@ install_dependencies_rpm() { yum install -y yum-utils readline-devel } +install lua_resty_ldap() { + luarocks install lua-resty-ldap +} + install_dependencies_deb() { # install basic dependencies DEBIAN_FRONTEND=noninteractive apt-get update