From d94a8fef8ddc91aeae4929e679b218542dea68c4 Mon Sep 17 00:00:00 2001 From: jash Date: Mon, 8 Oct 2018 14:26:15 +0200 Subject: [PATCH] renamed opentimestamps feature to otsclient --- install/generator-cyphernode/generators/app/features.json | 2 +- .../app/prompters/{400_opentimestamps.js => 400_otsclient.js} | 2 +- .../generators/app/templates/installer/config.sh | 2 +- .../generators/app/templates/installer/docker-compose.yaml | 2 +- install/script/install_docker.sh | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) rename install/generator-cyphernode/generators/app/prompters/{400_opentimestamps.js => 400_otsclient.js} (90%) diff --git a/install/generator-cyphernode/generators/app/features.json b/install/generator-cyphernode/generators/app/features.json index 533967d..56ede64 100644 --- a/install/generator-cyphernode/generators/app/features.json +++ b/install/generator-cyphernode/generators/app/features.json @@ -6,7 +6,7 @@ }, { "name": "Open timestamps client", - "value": "opentimestamps" + "value": "otsclient" }, { "name": "Electrum server", diff --git a/install/generator-cyphernode/generators/app/prompters/400_opentimestamps.js b/install/generator-cyphernode/generators/app/prompters/400_otsclient.js similarity index 90% rename from install/generator-cyphernode/generators/app/prompters/400_opentimestamps.js rename to install/generator-cyphernode/generators/app/prompters/400_otsclient.js index 238c45e..80cd80c 100644 --- a/install/generator-cyphernode/generators/app/prompters/400_opentimestamps.js +++ b/install/generator-cyphernode/generators/app/prompters/400_otsclient.js @@ -1,5 +1,5 @@ -const name = 'opentimestamps'; +const name = 'otsclient'; const featureCondition = function(props) { return props.features && props.features.indexOf( name ) != -1; } diff --git a/install/generator-cyphernode/generators/app/templates/installer/config.sh b/install/generator-cyphernode/generators/app/templates/installer/config.sh index 555817f..3079604 100644 --- a/install/generator-cyphernode/generators/app/templates/installer/config.sh +++ b/install/generator-cyphernode/generators/app/templates/installer/config.sh @@ -1,5 +1,5 @@ INSTALLER_MODE=<%= installer_mode %> BITCOIN_INTERNAL=<%= (bitcoin_mode==="internal"?'true':'false') %> FEATURE_LIGHTNING=<%= (features.indexOf('lightning') != -1)?'true':'false' %> -FEATURE_OPENTIMESTAMPS=<%= (features.indexOf('opentimestamps') != -1)?'true':'false' %> +FEATURE_OTSCLIENT=<%= (features.indexOf('otsclient') != -1)?'true':'false' %> FEATURE_ELECTRUM=<%= (features.indexOf('electrum') != -1)?'true':'false' %> diff --git a/install/generator-cyphernode/generators/app/templates/installer/docker-compose.yaml b/install/generator-cyphernode/generators/app/templates/installer/docker-compose.yaml index 0f1df01..4801ac8 100644 --- a/install/generator-cyphernode/generators/app/templates/installer/docker-compose.yaml +++ b/install/generator-cyphernode/generators/app/templates/installer/docker-compose.yaml @@ -15,7 +15,7 @@ services: "DB_PATH":"/proxyuser/db" "DB_FILE":"/proxyuser/db/proxydb" "PYCOIN_CONTAINER":"pycoin:7777" - "OTS_CONTAINER":"opentimestamps:6666" + "OTS_CONTAINER":"otsclient:6666" "DERIVATION_PUB32":"<%= xpub %>" "DERIVATION_PATH":"<%= derivation_path %>" "WATCHER_BTC_NODE_PRUNED":"<%= bitcoin_prune?'true':'false' %>" diff --git a/install/script/install_docker.sh b/install/script/install_docker.sh index f13eb4a..f4938db 100644 --- a/install/script/install_docker.sh +++ b/install/script/install_docker.sh @@ -18,8 +18,8 @@ install_docker() { build_docker_image ../SatoshiPortal/dockers/$arch/LN/c-lightning cyphernode/clightning fi - if [[ $FEATURE_OPENTIMESTAMPS == true ]]; then - trace "Opentimestamps support not implemented" + if [[ $FEATURE_OTSCLIENT == true ]]; then + build_docker_image ../SatoshiPortal/dockers/$arch/ots/otsclient cyphernode/otsclient fi