From 6a8c4794307eff182488106d21a54ff678e45d2c Mon Sep 17 00:00:00 2001 From: Sebastian Gerske Date: Wed, 9 Oct 2019 15:36:45 +0200 Subject: [PATCH] fix no-acl-contract documentation --- README.md | 4 ++-- start_ocean.sh | 17 ++++++----------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 3ea3494..199618a 100644 --- a/README.md +++ b/README.md @@ -102,14 +102,14 @@ will use the default Docker image tags for Aquarius, Keeper Contracts and Common | `--no-events-handler` | Start up Ocean without the `events-handler` Building Block. | | `--no-secret-store` | Start up Ocean without the `secret-store` Building Block. | | `--no-faucet` | Start up Ocean without the `faucet` Building Block. | +| `--no-acl-contract` | Disables the configuration of secret store's ACL contract address | | `--mongodb` | Start up Ocean with MongoDB as DB engine for Aquarius instead of Elasticsearch. | -| `--local-pacific-node` | Runs a local parity node and connects the node to the `pacific` network (official Ocean network | | `--local-ganache-node` | Runs a local `ganache` node. | | `--local-spree-node` | Runs a node of the local `spree` network. This is the default. | | `--local-duero-node` | Runs a local parity node and connects the node to the `duero` network. | | `--local-nile-node` | Runs a local parity node and connects the node to the `nile` network. | +| `--local-pacific-node` | Runs a local parity node and connects the node to the `pacific` network (official Ocean network | | `--reuse-ganache-database` | Configures a running `ganache` node to use a persistent database. | -| `--acl-contract` | Configures secret-store `acl_contract` option to enable secret-store authorization. | | `--force-pull` | Force pulling the latest revision of the used Docker images. | | `--purge` | Removes the Docker containers, volumes, artifact folder and networks used by the script. | diff --git a/start_ocean.sh b/start_ocean.sh index 29a6854..b3e4892 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -238,11 +238,10 @@ while :; do ################################################# # Exclude switches ################################################# - --no-commons) - COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/commons.yml/}" + --no-commons) + COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/commons.yml/}" printf $COLOR_Y'Starting without Commons...\n\n'$COLOR_RESET ;; - --no-events-handler) COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/events_handler.yml/}" printf $COLOR_Y'Starting without Events Handler...\n\n'$COLOR_RESET @@ -263,7 +262,10 @@ while :; do COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/faucet.yml/}" printf $COLOR_Y'Starting without Faucet...\n\n'$COLOR_RESET ;; - + --no-acl-contract) + export CONFIGURE_ACL="false" + printf $COLOR_Y'Disabling acl validation in secret-store...\n\n'$COLOR_RESET + ;; ################################################# # Only Secret Store ################################################# @@ -295,13 +297,6 @@ while :; do printf $COLOR_Y'Starting and reusing the database...\n\n'$COLOR_RESET ;; ################################################# - # Secret-Store validation switch - ################################################# - --no-acl-contract) - export CONFIGURE_ACL="false" - printf $COLOR_Y'Disabling acl validation in secret-store...\n\n'$COLOR_RESET - ;; - ################################################# # Node type switches ################################################# # spins up a new ganache blockchain