Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Add https port to gen_dev and rebar overlay #416

Open
wants to merge 1 commit into from

4 participants

@andrelaszlo

Changing the https port manually for all my devs each rebuild was
getting annoying, so I added a new variable https_port to
dev_vars.config and changed gen_dev accordingly. For consistency, I
also added the variable to vars.config.

@andrelaszlo andrelaszlo Add https port to gen_dev and rebar overlay
Changing the https port manually for all my devs each rebuild was
getting annoying, so I added a new variable `https_port` to
dev_vars.config and changed gen_dev accordingly. For consistency, I
also added the variable to vars.config.
faf7a7c
@jaredmorrow

We are in the middle of our 2.0 development / test cycle where our config is going to change dramatically from having an app.config to having a generated config based around a simple configuration file. Because of this, we probably won't merge this PR.

In addition, it will probably be best to use your branch as we have changed our development branch from 'master' to 'develop', so we aren't merging PR's into 'master' for now.

I'll /cc @joedevivo (who is the primary person reworking config) to make sure he knows to look out for this in 2.0.

Thanks for the PR, sorry it is not going to work with timing for us at the moment.

@andrelaszlo

@jaredmorrow No problem, just thought I should share :) I noticed that you changed the whole config system in 2.0 but I didn't know if you were still adding stuff to the 1.4 branch. Looking forward to see the final result!

@jaredmorrow

We are possibly releasing another rev on 1.4, but sadly 2.0 is keeping me too busy to give this a good look at the moment.

@slfritchie
Owner

Howdy. I don't believe that this kind of feature will be added to the 1.4 branch, and as Jared said, the Cuttlefish-based configuration scheme for Riak 2.0 changes your problem. (Hopefully in a good way!)

@andrelaszlo

Cuttlefish looks really promising, looking forward to seeing it in action. Thank you both for having a look!

@jaredmorrow

I don't think the presence of cuttlefish affects this issue at all. An https port still needs to be set as far as I know. Handing this off to @joedevivo so he can make a call.

@jaredmorrow jaredmorrow added this to the 2.0.1 milestone
@joedevivo joedevivo was unassigned by coderoshi
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Oct 21, 2013
  1. @andrelaszlo

    Add https port to gen_dev and rebar overlay

    andrelaszlo authored
    Changing the https port manually for all my devs each rebuild was
    getting annoying, so I added a new variable `https_port` to
    dev_vars.config and changed gen_dev accordingly. For consistency, I
    also added the variable to vars.config.
This page is out of date. Refresh to see the latest.
View
2  rel/files/app.config
@@ -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:
View
4 rel/gen_dev
@@ -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
View
1  rel/vars.config
@@ -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}.
View
1  rel/vars/dev_vars.config.src
@@ -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@}.
Something went wrong with that request. Please try again.