From c832d1d0502c920ecacca2d4b865e931c71751ad Mon Sep 17 00:00:00 2001 From: Derek Smith Date: Wed, 1 Feb 2023 16:02:38 -0500 Subject: [PATCH] 1 --- deployment/cluster_env.sh | 2 +- deployment/deploy.sh | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/deployment/cluster_env.sh b/deployment/cluster_env.sh index 82a6953..83a81ec 100755 --- a/deployment/cluster_env.sh +++ b/deployment/cluster_env.sh @@ -41,7 +41,7 @@ source "$CLUSTER_DEFINITION" # source project defition. # Now let's load the project definition. -PROJECT_PATH="$PROJECTS_DIR/$BITCOIN_CHAIN" +PROJECT_PATH="$PROJECTS_DIR/$PROJECT_NAME" PROJECT_DEFINITION_PATH="$PROJECT_PATH/project_definition" source "$PROJECT_DEFINITION_PATH" diff --git a/deployment/deploy.sh b/deployment/deploy.sh index cde73dc..074cd09 100755 --- a/deployment/deploy.sh +++ b/deployment/deploy.sh @@ -313,19 +313,19 @@ EOL } -PROJECT_PATH="$PROJECTS_DIR/$BITCOIN_CHAIN" +PROJECT_PATH="$PROJECTS_DIR/$PROJECT_NAME" mkdir -p "$PROJECT_PATH" "$CLUSTER_PATH/projects" export PROJECT_PATH="$PROJECT_PATH" # create a symlink from ./clusterpath/projects/project -if [ ! -d "$CLUSTER_PATH/projects/$BITCOIN_CHAIN" ]; then - ln -s "$PROJECT_PATH" "$CLUSTER_PATH/projects/$BITCOIN_CHAIN" +if [ ! -d "$CLUSTER_PATH/projects/$PROJECT_NAME" ]; then + ln -s "$PROJECT_PATH" "$CLUSTER_PATH/projects/$PROJECT_NAME" fi -# create the lxc project as specified by BITCOIN_CHAIN -if ! lxc project list | grep -q "$BITCOIN_CHAIN"; then +# create the lxc project as specified by PROJECT_NAME +if ! lxc project list | grep -q "$PROJECT_NAME"; then echo "INFO: The lxd project specified in the cluster_definition did not exist. We'll create one!" - lxc project create "$BITCOIN_CHAIN" + lxc project create "$PROJECT_NAME" fi # # check if we need to provision a new lxc project. @@ -400,6 +400,9 @@ export DEPLOY_BTCPAY_SERVER=true export SITE_PATH="$SITES_PATH/$DOMAIN_NAME" export PRIMARY_WWW_FQDN="$WWW_HOSTNAME.$DOMAIN_NAME" +echo "HERE" +exit 1 + stub_site_definition # bring the VMs up under the primary domain name.