ss/project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unindent due to project iteration removal.

Browse Source
This commit is contained in:
Derek Smith 2023-04-02 09:20:34 -04:00
parent 589a062e99
commit b5c1c22db0
Signed by: farscapian
GPG Key ID: B443E530A14E1C90
1 changed files with 145 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
deploy.sh
View File

@ -291,8 +291,7 @@ EOL
exit 1 exit 1
fi fi
# source project defition. . ../project_env.sh
source "$PROJECT_DEFINITION_PATH"
if [ -z "$PRIMARY_DOMAIN" ]; then if [ -z "$PRIMARY_DOMAIN" ]; then
echo "ERROR: The PRIMARY_DOMAIN is not specified. Check your project.conf." echo "ERROR: The PRIMARY_DOMAIN is not specified. Check your project.conf."
@ -325,6 +324,9 @@ EOL
export SITE_PATH="$SITES_PATH/$DOMAIN_NAME" export SITE_PATH="$SITES_PATH/$DOMAIN_NAME"
export PRIMARY_WWW_FQDN="$WWW_HOSTNAME.$DOMAIN_NAME" export PRIMARY_WWW_FQDN="$WWW_HOSTNAME.$DOMAIN_NAME"
stub_site_definition stub_site_definition
# bring the VMs up under the primary domain name. # bring the VMs up under the primary domain name.
@ -356,12 +358,6 @@ EOL
exit 1 exit 1
fi fi
# create the lxc project as specified by PROJECT_NAME
if ! lxc project list | grep -q "$PROJECT_NAME"; then
lxc project create "$PROJECT_NAME"
lxc project set "$PROJECT_NAME" features.networks=true features.images=false features.storage.volumes=false
fi
# Goal is to get the macvlan interface. # Goal is to get the macvlan interface.
LXD_SS_CONFIG_LINE= LXD_SS_CONFIG_LINE=
if lxc network list --format csv --project=default | grep lxdbr0 | grep -q "ss-config"; then if lxc network list --format csv --project=default | grep lxdbr0 | grep -q "ss-config"; then
@ -380,7 +376,6 @@ EOL
# Now let's switch to the new project to ensure new resources are created under the project scope. # Now let's switch to the new project to ensure new resources are created under the project scope.
if ! lxc info | grep "project:" | grep -q "$PROJECT_NAME"; then if ! lxc info | grep "project:" | grep -q "$PROJECT_NAME"; then
echo "INFO: switch to lxd project '$PROJECT_NAME'."
lxc project switch "$PROJECT_NAME" lxc project switch "$PROJECT_NAME"
fi fi
@ -424,9 +419,9 @@ EOL
export FQDN="$FQDN" export FQDN="$FQDN"
export LXD_VM_NAME="${FQDN//./-}" export LXD_VM_NAME="${FQDN//./-}"
export REMOTE_CERT_DIR="$REMOTE_CERT_BASE_DIR/$FQDN"
export MAC_ADDRESS_TO_PROVISION="$MAC_ADDRESS_TO_PROVISION" export MAC_ADDRESS_TO_PROVISION="$MAC_ADDRESS_TO_PROVISION"
export PROJECT_PATH="$PROJECT_PATH" export PROJECT_PATH="$PROJECT_PATH"
export ROOT_DISK_SIZE_GB="$ROOT_DISK_SIZE_GB"
./deploy_vm.sh ./deploy_vm.sh
@ -465,5 +460,3 @@ EOL
ssh ubuntu@"$BTCPAY_FQDN" "echo $LATEST_GIT_COMMIT > /home/ubuntu/.ss-githead" ssh ubuntu@"$BTCPAY_FQDN" "echo $LATEST_GIT_COMMIT > /home/ubuntu/.ss-githead"
fi fi
done