Skip to content

Commit

Permalink
env openssl prefix
Browse files Browse the repository at this point in the history
Signed-off-by: Ashish Tiwari <ashishjaitiwari15112000@gmail.com>
  • Loading branch information
Revolyssup committed Nov 10, 2023
1 parent 51696fa commit 1e5e944
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ENV_DOCKER ?= docker
ENV_DOCKER_COMPOSE ?= docker-compose --project-directory $(CURDIR) -p $(project_name) -f $(project_compose_ci)
ENV_NGINX ?= $(ENV_NGINX_EXEC) -p $(CURDIR) -c $(CURDIR)/conf/nginx.conf
ENV_NGINX_EXEC := $(shell command -v openresty 2>/dev/null || command -v nginx 2>/dev/null)
ENV_OPENSSL_PREFIX := /usr/local/openssl
ENV_OPENSSL_PREFIX ?= /usr/local/openssl
ifeq ($(wildcard $(ENV_OPENSSL_PREFIX)/lib),)
OPENSSL_LIB_DIR := $(ENV_OPENSSL_PREFIX)/lib64 #When /lib doesn't exist
else
Expand Down
2 changes: 1 addition & 1 deletion utils/install-openssl-fips.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if [ ! -d "$(pwd)/openssl-3.1.3" ]; then
sudo make install
export LD_LIBRARY_PATH=$OPENSSL3_PREFIX${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
sudo ldconfig
export openssl_prefix="$OPENSSL3_PREFIX"
export openssl_prefix="/usr/local/openssl"
cd ..
fi

2 changes: 1 addition & 1 deletion utils/install-openssl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if [ ! -d "$(pwd)/openssl-3.1.3" ]; then
sudo make install
export LD_LIBRARY_PATH=$OPENSSL3_PREFIX${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
sudo ldconfig
export openssl_prefix="$OPENSSL3_PREFIX"
export openssl_prefix="/usr/local/openssl"
ls /usr/local/openssl
cd ..
fi
Expand Down

0 comments on commit 1e5e944

Please sign in to comment.