Compare commits
2 Commits
afa6c530ff
...
34c1edf27e
Author | SHA1 | Date | |
---|---|---|---|
34c1edf27e | |||
180cd1fa8d |
@ -101,4 +101,4 @@ export PRIMARY_DOMAIN=
|
|||||||
# this is the git commit of the project/ sub git repo.
|
# this is the git commit of the project/ sub git repo.
|
||||||
# used in the migration script to switch into past for backup
|
# used in the migration script to switch into past for backup
|
||||||
# then back to present (TARGET_PROJECT_GIT_COMMIT) for restore.
|
# then back to present (TARGET_PROJECT_GIT_COMMIT) for restore.
|
||||||
export TARGET_PROJECT_GIT_COMMIT=c042ff404f02d3fc1739b325660411c68e3bf0b3
|
export TARGET_PROJECT_GIT_COMMIT=5e8cc9cee0555bd8736a3116cfa091c88030abba
|
||||||
|
@ -17,7 +17,8 @@ if [ ! -f "$PROJECT_DEFINITION_PATH" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
source "$PROJECT_DEFINITION_PATH"
|
source "$PROJECT_DEFINITION_PATH"
|
||||||
export PRIMARY_SITE_DEFINITION_PATH="$SITES_PATH/$PRIMARY_DOMAIN/site_definition"
|
|
||||||
|
export PRIMARY_SITE_DEFINITION_PATH="$SITES_PATH/$PRIMARY_DOMAIN/site.conf"
|
||||||
|
|
||||||
if [ ! -f "$PRIMARY_SITE_DEFINITION_PATH" ]; then
|
if [ ! -f "$PRIMARY_SITE_DEFINITION_PATH" ]; then
|
||||||
echo "ERROR: the site definition does not exist."
|
echo "ERROR: the site definition does not exist."
|
||||||
@ -29,4 +30,10 @@ if [ -z "$PRIMARY_DOMAIN" ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
source "$PRIMARY_SITE_DEFINITION_PATH"
|
source "$PRIMARY_SITE_DEFINITION_PATH"
|
||||||
|
|
||||||
|
if ! lxc info | grep "project:" | grep -q "$PROJECT_NAME"; then
|
||||||
|
if lxc project list | grep -q "$PROJECT_NAME"; then
|
||||||
|
lxc project switch "$PROJECT_NAME"
|
||||||
|
fi
|
||||||
|
fi
|
@ -51,7 +51,7 @@ for PROJECT_CHAIN in ${DEPLOYMENT_STRING//,/ }; do
|
|||||||
|
|
||||||
# source the site path so we know what features it has.
|
# source the site path so we know what features it has.
|
||||||
source ../defaults.sh
|
source ../defaults.sh
|
||||||
source "$SITE_PATH/site_definition"
|
source "$SITE_PATH/site.conf"
|
||||||
source ./project/domain_env.sh
|
source ./project/domain_env.sh
|
||||||
|
|
||||||
# now we want to switch the git HEAD of the project subdirectory to the
|
# now we want to switch the git HEAD of the project subdirectory to the
|
||||||
|
Loading…
Reference in New Issue
Block a user