Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add https port to gen_dev and rebar overlay #416

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rel/files/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

%% https is a list of IP addresses and TCP ports that the Riak
%% HTTPS interface will bind.
%{https, [{ "{{web_ip}}", {{web_port}} }]},
%{https, [{ "{{web_ip}}", {{https_port}} }]},

%% Default cert and key locations for https can be overridden
%% with the ssl config variable, for example:
Expand Down
4 changes: 3 additions & 1 deletion rel/gen_dev
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ NUMBER=${NAME##dev}
BASE=$((10000 + 10 * $NUMBER))
PBPORT=$(($BASE + 7))
WEBPORT=$(($BASE + 8))
HTTPSPORT=$(($BASE + 6))
HANDOFFPORT=$(($BASE + 9))

echo "Generating $NAME - node='$NODE' pbc=$PBPORT http=$WEBPORT handoff=$HANDOFFPORT"
echo "Generating $NAME - node='$NODE' pbc=$PBPORT http=$WEBPORT handoff=$HANDOFFPORT https=$HTTPSPORT"
sed -e "s/@NODE@/$NODE/" \
-e "s/@PBPORT@/$PBPORT/" \
-e "s/@WEBPORT@/$WEBPORT/" \
-e "s/@HTTPSPORT@/$HTTPSPORT/" \
-e "s/@HANDOFFPORT@/$HANDOFFPORT/" < $TEMPLATE > $VARFILE
1 change: 1 addition & 0 deletions rel/vars.config
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
%%
{web_ip, "127.0.0.1"}.
{web_port, 8098}.
{https_port, 8096}.
{handoff_port, 8099}.
{pb_ip, "127.0.0.1"}.
{pb_port, 8087}.
Expand Down
1 change: 1 addition & 0 deletions rel/vars/dev_vars.config.src
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
%%
{web_ip, "127.0.0.1"}.
{web_port, @WEBPORT@}.
{https_port, @HTTPSPORT@}.
{handoff_port, @HANDOFFPORT@}.
{pb_ip, "127.0.0.1"}.
{pb_port, @PBPORT@}.
Expand Down