Specter is now optional, enabled by default

This commit is contained in:
kexkey
2020-11-16 17:40:17 -05:00
parent eb5c6a0cd4
commit 26db143b22
5 changed files with 28 additions and 4 deletions

View File

@@ -14,6 +14,9 @@
{
"name": "Batcher Cypherapp",
"value": "batcher"
},
{
"name": "Specter Cypherapp",
"value": "specter"
}
]

View File

@@ -534,6 +534,10 @@ module.exports = class App {
networks: ['cyphernodeappsnet'],
docker: "cyphernode/batcher:" + this.config.docker_versions['cyphernode/batcher']
},
specter: {
networks: ['cyphernodeappsnet'],
docker: "cyphernode/specter:" + this.config.docker_versions['cyphernode/specter']
},
lightning: {
networks: ['cyphernodenet'],
docker: "cyphernode/clightning:"+this.config.docker_versions['cyphernode/clightning'],

View File

@@ -178,7 +178,7 @@
"$id": "#/properties/features",
"type": "array",
"title": "The optional features of this cyphernode",
"default": [],
"default": ["specter"],
"items": {
"$id": "#/properties/features/items",
"type": "string",
@@ -186,7 +186,8 @@
"tor",
"lightning",
"otsclient",
"batcher"
"batcher",
"specter"
],
"title": "The feature",
"default": "",
@@ -194,7 +195,8 @@
"tor",
"lightning",
"otsclient",
"batcher"
"batcher",
"specter"
]
}
},

View File

@@ -2,6 +2,7 @@ INSTALLER_MODE=<%= installer_mode %>
BITCOIN_INTERNAL=<%= (bitcoin_mode==="internal"?'true':'false') %>
FEATURE_LIGHTNING=<%= (features.indexOf('lightning') != -1)?'true':'false' %>
FEATURE_BATCHER=<%= (features.indexOf('batcher') != -1)?'true':'false' %>
FEATURE_SPECTER=<%= (features.indexOf('specter') != -1)?'true':'false' %>
FEATURE_OTSCLIENT=<%= (features.indexOf('otsclient') != -1)?'true':'false' %>
LIGHTNING_IMPLEMENTATION=<%= lightning_implementation %>
PROXY_DATAPATH=<%= proxy_datapath %>

14
dist/setup.sh vendored
View File

@@ -795,6 +795,20 @@ install_apps() {
next
fi
fi
if [[ $FEATURE_SPECTER == true ]]; then
if [ -d "$current_path/apps/specter" ]; then
step " delete ignoreThisApp for enabled Specter"
sudo_if_required rm -f $current_path/apps/specter/ignoreThisApp
next
fi
else
if [ -d "$current_path/apps/specter" ]; then
step " create ignoreThisApp for disabled Specter"
sudo_if_required touch $current_path/apps/specter/ignoreThisApp
next
fi
fi
}
install() {