gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enable TLS build by default (#43)

Browse Source 
* enable TLS build by default

* move export to src folder

* fix comments
This commit is contained in:
Artem Danilov 2022-02-11 16:36:42 -08:00 committed by GitHub Enterprise
parent e37cb4c925
commit 7e057b5856
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,4 +1,4 @@
# Top level makefile, the real shit is at src/Makefile # Top level makefile, this just calls into src/Makefile where the real work is done. Changes should be made there.
default: all default: all

13
README.md
View File

@ -92,17 +92,12 @@ Init and clone submodule dependencies:
Install dependencies: Install dependencies:
% sudo apt install build-essential nasm autotools-dev autoconf libjemalloc-dev tcl tcl-dev uuid-dev libcurl4-openssl-dev libbz2-dev libzstd-dev liblz4-dev libsnappy-dev % sudo apt install build-essential nasm autotools-dev autoconf libjemalloc-dev tcl tcl-dev uuid-dev libcurl4-openssl-dev libbz2-dev libzstd-dev liblz4-dev libsnappy-dev libssl-dev
Compiling is as simple as: Compiling is as simple as:
% make % make
To build with TLS support, you'll need OpenSSL development libraries (e.g.
libssl-dev on Debian/Ubuntu) and run:
% make BUILD_TLS=yes
To build with systemd support, you'll need systemd development libraries (such To build with systemd support, you'll need systemd development libraries (such
as libsystemd-dev on Debian/Ubuntu or systemd-devel on CentOS) and run: as libsystemd-dev on Debian/Ubuntu or systemd-devel on CentOS) and run:
@ -115,7 +110,7 @@ To append a suffix to KeyDB program names, use:
***Note that the following dependencies may be needed: ***Note that the following dependencies may be needed:
% sudo apt-get install autoconf autotools-dev libnuma-dev libtool % sudo apt-get install autoconf autotools-dev libnuma-dev libtool
If TLS is built, running the tests with TLS enabled (you will need `tcl-tls` Running the tests with TLS enabled (you will need `tcl-tls`
installed): installed):
% ./utils/gen-test-certs.sh % ./utils/gen-test-certs.sh
@ -217,11 +212,11 @@ All the options in keydb.conf are also supported as options using the command
line, with exactly the same name. line, with exactly the same name.
Running Redis with TLS: Running KeyDB with TLS:
------------------ ------------------
Please consult the [TLS.md](TLS.md) file for more information on Please consult the [TLS.md](TLS.md) file for more information on
how to use Redis with TLS. how to use KeyDB with TLS.
Playing with KeyDB Playing with KeyDB

5
TLS.md
View File

@ -6,10 +6,7 @@ Getting Started
### Building ### Building
To build with TLS support you'll need OpenSSL development libraries (e.g. TLS support is enabled in the default build. To build without TLS, run `make BUILD_TLS=no`.
libssl-dev on Debian/Ubuntu).
Run `make BUILD_TLS=yes`.
### Tests ### Tests

4
src/Makefile
View File

@ -12,6 +12,10 @@
# Dependencies are stored in the Makefile.dep file. To rebuild this file # Dependencies are stored in the Makefile.dep file. To rebuild this file
# Just use 'make dep', but this is only needed by developers. # Just use 'make dep', but this is only needed by developers.
# we ship KeyDB with TLS by default
# export it here as both this file and deps/Makefile uses it
export BUILD_TLS ?= yes
release_hdr := $(shell sh -c './mkreleasehdr.sh') release_hdr := $(shell sh -c './mkreleasehdr.sh')
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')