diff options
author | varac <varacanero@zeromail.org> | 2014-12-09 20:20:23 +0000 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2014-12-09 20:20:23 +0000 |
commit | 76de9919d0b27a9eb66f096713e0fc9e411c880e (patch) | |
tree | 25db91abab6a80c6c89524623837596222449817 | |
parent | 1247ac0fd7f196ace6bbed9c1ecdc41c49472df2 (diff) |
fixed minor bugs on create_provider() and add_nodes()
-rwxr-xr-x | leap-platform-test | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/leap-platform-test b/leap-platform-test index 10b91b2..91f06a9 100755 --- a/leap-platform-test +++ b/leap-platform-test @@ -43,11 +43,11 @@ add_nodes() { config="openvpn.gateway_address:${IP_PREFIX}.98 openvpn.second_gateway_address:${IP_PREFIX}.99" ;; *) - config='' + config= ;; esac - $LEAP_CMD node add --local "$node" ip_address:"$ip" "$config" services:"$services" + $LEAP_CMD node add --local "$node" ip_address:"$ip" $config services:"$services" done } @@ -77,24 +77,25 @@ create_provider() { exit 1 fi + git clone -b "$PLATFORM_BRANCH" --recursive https://leap.se/git/leap_platform.git "$PLATFORMDIR" + mkdir -p "$PROVIDERDIR" cd "$PROVIDERDIR" - $LEAP_CMD $OPTS new --contacts "$CONTACTS" --domain "$DOMAIN" --name "$PROVIDER" --platform="$PLATFORMDIR" . - cd "$PLATFORMDIR" - git checkout "$PLATFORM_BRANCH" - git submodule sync - git submodule update --init - cd "$PROVIDERDIR" + # for now, we use the vagrant pubkey until https://leap.se/code/issues/2039 is solved $LEAP_CMD $OPTS add-user --self --ssh-pub-key="$SSHKEY" - $LEAP_CMD $OPTS cert ca && leap cert csr + $LEAP_CMD $OPTS cert ca && $LEAP_CMD $OPTS cert csr # copy for faster testing #cp $ROOTDIR/dh.pem.test $PROVIDERDIR/files/ca/dh.pem $LEAP_CMD $OPTS cert dh - add_nodes "$NODES" + add_nodes $NODES + + git init + git add . + git commit -m"finished create_provider" } deploy() { |