Flag to disable creation of default node

pull/600/head
Piero Toffanin 2019-01-16 12:12:17 -05:00
rodzic 0fca052900
commit b32c552fdd
2 zmienionych plików z 20 dodań i 3 usunięć

Wyświetl plik

@ -9,7 +9,7 @@ A free, user-friendly, extendable application and [API](http://docs.webodm.org)
* [Getting Started](#getting-started)
* [Add More Processing Nodes](#add-more-processing-nodes)
* [Manage Processing Nodes](#manage-processing-nodes)
* [Enable SSL](#enable-ssl)
* [Where Are My Files Stored?](#where-are-my-files-stored)
* [Common Troubleshooting](#common-troubleshooting)
@ -80,7 +80,7 @@ For Windows and macOS users an [installer](https://www.webodm.org/installer) is
You can also run WebODM from a Live USB/DVD. See [LiveODM](https://www.opendronemap.org/liveodm/).
### Add More Processing Nodes
### Manage Processing Nodes
WebODM can be linked to one or more processing nodes running [NodeODM](https://github.com/OpenDroneMap/NodeODM). The default configuration already includes a "node-odm-1" processing node which runs on the same machine as WebODM, just to help you get started. As you become more familiar with WebODM, you might want to install processing nodes on separate machines.
@ -88,6 +88,12 @@ Adding more processing nodes will allow you to run multiple jobs in parallel.
You **will not be able to distribute a single job across multiple processing nodes**. We are actively working to bring this feature to reality, but we're not there yet.
If you don't need the default "node-odm-1" node, simply pass the `--no-default-node` flag when starting WebODM:
`./webodm.sh restart --no-default-node`.
Then from the web interface simply manually remove the "node-odm-1" node.
### Enable SSL
WebODM has the ability to automatically request and install a SSL certificate via [Lets Encrypt](https://letsencrypt.org/), or you can manually specify your own key/certificate pair.

Wyświetl plik

@ -28,6 +28,8 @@ elif [[ $platform = "MacOS / OSX" ]] && [[ $(pwd) == /Users* ]]; then
plugins_volume=true
fi
load_default_node=true
# Load default values
source .env
DEFAULT_PORT="$WO_PORT"
@ -91,6 +93,10 @@ case $key in
plugins_volume=true
shift # past argument
;;
--no-default-node)
load_default_node=false
shift # past argument
;;
*) # unknown option
POSITIONAL+=("$1") # save it in an array for later
shift # past argument
@ -125,6 +131,7 @@ usage(){
echo " --port <port> Set the port that WebODM should bind to (default: $DEFAULT_PORT)"
echo " --hostname <hostname> Set the hostname that WebODM will be accessible from (default: $DEFAULT_HOST)"
echo " --media-dir <path> Path where processing results will be stored to (default: $DEFAULT_MEDIA_DIR (docker named volume))"
echo " --no-default-node Do not create a default NodeODM node attached to WebODM on startup (default: disabled)"
echo " --ssl Enable SSL and automatically request and install a certificate from letsencrypt.org. (default: $DEFAULT_SSL)"
echo " --ssl-key <path> Manually specify a path to the private key file (.pem) to use with nginx to enable SSL (default: None)"
echo " --ssl-cert <path> Manually specify a path to the certificate file (.pem) to use with nginx to enable SSL (default: None)"
@ -193,7 +200,11 @@ start(){
echo "Make sure to issue a $0 down if you decide to change the environment."
echo ""
command="docker-compose -f docker-compose.yml -f docker-compose.nodeodm.yml"
command="docker-compose -f docker-compose.yml"
if [[ $load_default_node = true ]]; then
command+=" -f docker-compose.nodeodm.yml"
fi
if [ "$WO_SSL" = "YES" ]; then
if [ ! -z "$WO_SSL_KEY" ] && [ ! -e "$WO_SSL_KEY" ]; then