From 04aa66c47803707ad3aff50978e1347818ac29f2 Mon Sep 17 00:00:00 2001 From: Tariq Islam Date: Sun, 2 Apr 2023 01:41:02 -0500 Subject: [PATCH] Changes to add --db-dir option for Postgres. --- .env | 1 + docker-compose.yml | 2 +- webodm.sh | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.env b/.env index 27b31eff..5ff6f7a0 100644 --- a/.env +++ b/.env @@ -1,6 +1,7 @@ WO_HOST=localhost WO_PORT=8000 WO_MEDIA_DIR=appmedia +WO_DB_DIR=dbdata WO_SSL=NO WO_SSL_KEY= WO_SSL_CERT= diff --git a/docker-compose.yml b/docker-compose.yml index 2de0d85e..f035b5d6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: ports: - "5432" volumes: - - dbdata:/var/lib/postgresql/data:Z + - ${WO_DB_DIR}:/var/lib/postgresql/data:Z restart: unless-stopped oom_score_adj: -100 webapp: diff --git a/webodm.sh b/webodm.sh index 180526f2..b979a09d 100755 --- a/webodm.sh +++ b/webodm.sh @@ -33,6 +33,7 @@ source "${__dirname}/.env" DEFAULT_PORT="$WO_PORT" DEFAULT_HOST="$WO_HOST" DEFAULT_MEDIA_DIR="$WO_MEDIA_DIR" +DEFAULT_DB_DIR="$WO_DB_DIR" DEFAULT_SSL="$WO_SSL" DEFAULT_SSL_INSECURE_PORT_REDIRECT="$WO_SSL_INSECURE_PORT_REDIRECT" DEFAULT_BROKER="$WO_BROKER" @@ -60,6 +61,12 @@ case $key in export WO_MEDIA_DIR shift # past argument shift # past value + ;; + --db-dir) + WO_DB_DIR=$(realpath "$2") + export WO_DB_DIR + shift # past argument + shift # past value ;; --ssl) export WO_SSL=YES @@ -150,6 +157,7 @@ usage(){ echo " --port Set the port that WebODM should bind to (default: $DEFAULT_PORT)" echo " --hostname Set the hostname that WebODM will be accessible from (default: $DEFAULT_HOST)" echo " --media-dir Path where processing results will be stored to (default: $DEFAULT_MEDIA_DIR (docker named volume))" + echo " --db-dir Path where the Postgres db data will be stored to (default: $DEFAULT_DB_DIR (docker named volume))" echo " --default-nodes The amount of default NodeODM nodes attached to WebODM on startup (default: $DEFAULT_NODES)" echo " --with-micmac Create a NodeMICMAC node attached to WebODM on startup. Experimental! (default: disabled)" echo " --ssl Enable SSL and automatically request and install a certificate from letsencrypt.org. (default: $DEFAULT_SSL)" @@ -324,6 +332,7 @@ start(){ echo "Host: $WO_HOST" echo "Port: $WO_PORT" echo "Media directory: $WO_MEDIA_DIR" + echo "Postgres DB directory: $WO_DB_DIR" echo "SSL: $WO_SSL" echo "SSL key: $WO_SSL_KEY" echo "SSL certificate: $WO_SSL_CERT"