Skip to content

Commit fd1acf4

Browse files
committed
fix SSL options for OTP25 and OTP26
- updated make_certs from OTP upstream Signed-off-by: Alejandro M. Ramallo <alejandro.ramallo@leapsight.com>
1 parent 46e3be7 commit fd1acf4

7 files changed

+617
-230
lines changed

Makefile

+16-30
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ PARTISAN_EQWALIZER = 0
2020
OTPVSN = $(shell erl -eval 'erlang:display(erlang:system_info(otp_release)), halt().' -noshell)
2121

2222
.PHONY: compile-no-deps alt-test core-test otp-test test docs xref dialyzer-run dialyzer-quick dialyzer eqwalizer eqwalize-all\
23-
cleanplt upload-docs rel deps test plots spellcheck spellfix certs node1 node2 node3 node
23+
cleanplt upload-docs rel deps test plots spellcheck spellfix certs node1 node2 node3 node checkssl
2424

2525
all: compile
2626

@@ -160,39 +160,25 @@ logs:
160160
## Release targets
161161
##
162162

163+
163164
node1:
164-
RELX_REPLACE_OS_VARS=true \
165-
ERL_NODE_NAME=node1@127.0.0.1 \
166-
PARTISAN_PEER_PORT=10100 \
167-
_build/node/rel/partisan/bin/partisan console
165+
${REBAR} as node1 release
166+
ERL_DIST_PORT=37781 _build/node1/rel/partisan/bin/partisan console
168167

169168
node2:
170-
${REBAR} as node release
171-
RELX_REPLACE_OS_VARS=true \
172-
ERL_NODE_NAME=node2@127.0.0.1 \
173-
PARTISAN_PEER_PORT=10200 \
174-
_build/node/rel/partisan/bin/partisan console
175-
176-
node3: export ERL_NODE_NAME=node3@127.0.0.1
177-
node3: export PARTISAN_PEER_PORT=10300
178-
node3: noderun
179-
180-
# ERL_NODE_NAME=node4@127.0.0.1 make node
181-
node: noderun
182-
ifndef ERL_NODE_NAME
183-
$(error ERL_NODE_NAME is undefined)
184-
endif
185-
ifndef PARTISAN_PEER_PORT
186-
$(error PARTISAN_PEER_PORT is undefined)
187-
endif
188-
${REBAR} as node release
189-
RELX_REPLACE_OS_VARS=true _build/node/rel/partisan/bin/partisan console
190-
191-
192-
noderun:
193-
${REBAR} as node release
194-
RELX_REPLACE_OS_VARS=true _build/node/rel/partisan/bin/partisan console
169+
${REBAR} as node2 release
170+
ERL_DIST_PORT=37782 _build/node2/rel/partisan/bin/partisan console
171+
172+
node3:
173+
${REBAR} as node3 release
174+
ERL_DIST_PORT=37783 _build/node3/rel/partisan/bin/partisan console
175+
195176

177+
checkssl:
178+
openssl s_client -connect localhost:10100 \
179+
-cert config/_ssl/client/cert.pem \
180+
-key config/_ssl/client/keycert.pem \
181+
-CAfile config/_ssl/client/cacerts.pem
196182
rel:
197183
${REBAR} as test release
198184

0 commit comments

Comments
 (0)