From 35afd1bbd4dbc93e1fb33fc7b86fc7a99d5216ca Mon Sep 17 00:00:00 2001
From: Derek Smith <derek@farscapian.com>
Date: Tue, 4 Apr 2023 11:30:07 -0400
Subject: [PATCH] Path updates.

---
 defaults.sh              | 6 ++++--
 deployment/remote_env.sh | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/defaults.sh b/defaults.sh
index 5ddebb7..18c09a1 100755
--- a/defaults.sh
+++ b/defaults.sh
@@ -90,13 +90,15 @@ export BASE_LXC_IMAGE="ubuntu/$LXD_UBUNTU_BASE_VERSION/cloud"
 WEEK_NUMBER=$(date +%U)
 export UBUNTU_BASE_IMAGE_NAME="ss-ubuntu-${LXD_UBUNTU_BASE_VERSION//./-}"
 
-export DOCKER_BASE_IMAGE_NAME="ss-docker-${LXD_UBUNTU_BASE_VERSION//./-}-$WEEK_NUMBER-A"
+export DOCKER_BASE_IMAGE_NAME="ss-docker-${LXD_UBUNTU_BASE_VERSION//./-}-$WEEK_NUMBER"
 
 export OTHER_SITES_LIST=
 export BTCPAY_ALT_NAMES=
 export BITCOIN_CHAIN=regtest
 export REMOTE_HOME="/home/ubuntu"
-export REMOTE_DATA_PATH="/home/ubuntu/ss-data"
+export REMOTE_DATA_PATH="$REMOTE_HOME/ss-data"
+export REMOTE_DATA_PATH_LETSENCRYPT="$REMOTE_DATA_PATH/letsencrypt"
+export REMOTE_BACKUP_PATH="$REMOTE_HOME/backups"
 export BTCPAY_SERVER_APPPATH="$REMOTE_DATA_PATH/btcpayserver-docker"
 
 # this space is for OS, docker images, etc. DOES NOT INCLUDE USER DATA.
diff --git a/deployment/remote_env.sh b/deployment/remote_env.sh
index 4ee39b1..1da5cd4 100755
--- a/deployment/remote_env.sh
+++ b/deployment/remote_env.sh
@@ -26,7 +26,7 @@ if echo "$CURRENT_REMOTE" | grep -q "production"; then
 
 fi
 
-export REMOTE_PATH="$REMOTES_DIR/$CURRENT_REMOTE"
+export REMOTE_PATH="$REMOTES_PATH/$CURRENT_REMOTE"
 REMOTE_DEFINITION="$REMOTE_PATH/remote.conf"
 export REMOTE_DEFINITION="$REMOTE_DEFINITION"