X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Fstandup.sh;h=ca9ee7680d75dc252999ed5e79561fe987a83724;hb=f784ba54b77cfeee2b1840e7b30dc1ac689d4dde;hp=c31a33d8390e0e11487dec439146a08e780d3cdb;hpb=e8675a3b3139f59bea4efc73022690847deecdc9;p=feisty_meow.git diff --git a/scripts/site_avenger/standup.sh b/scripts/site_avenger/standup.sh index c31a33d8..ca9ee768 100644 --- a/scripts/site_avenger/standup.sh +++ b/scripts/site_avenger/standup.sh @@ -6,8 +6,8 @@ # management scripts. So far, the scripts rely on at least php. The support # is much more powerful if the site is based on cakephp and site avenger. -export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory. -export FEISTY_MEOW_APEX="$( \cd "$WORKDIR/../.." && \pwd )" +export THISDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory. +export FEISTY_MEOW_APEX="$( \cd "$THISDIR/../.." && \pwd )" source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh" @@ -51,11 +51,11 @@ fi # through to ask for access. sudo bash -c 'echo sudo permissions acquired.' -source "$WORKDIR/shared_site_mgr.sh" +source "$THISDIR/shared_site_mgr.sh" sep -check_application_dir "$BASE_APPLICATION_PATH" +check_apps_root "$BASE_APPLICATION_PATH" # find proper webroot where the site will be initialized. if [ -z "$app_dirname" ]; then @@ -64,16 +64,30 @@ if [ -z "$app_dirname" ]; then else test_app_folder "$BASE_APPLICATION_PATH" "$app_dirname" fi +exit_on_error "finding and testing app folder" #echo "!! domain being added is: $DOMAIN_NAME" sudo bash "$FEISTY_MEOW_SCRIPTS/system/add_domain.sh" "$DOMAIN_NAME" -test_or_die "Setting up domain: $DOMAIN_NAME" +exit_on_error "Setting up domain: $DOMAIN_NAME" sep +# add the main website as specified by the domain name they gave us. sudo bash "$FEISTY_MEOW_SCRIPTS/system/add_apache_site.sh" "$APPLICATION_NAME" "$DOMAIN_NAME" -test_or_die "Setting up apache site for: $APPLICATION_NAME" +exit_on_error "Setting up apache site for: $APPLICATION_NAME" + +# make the shadow site also, which always ends in cakelampvm.com. +shadow_domain="${APPLICATION_NAME}.cakelampvm.com" +if [ "$shadow_domain" != "$DOMAIN_NAME" ]; then + sudo bash "$FEISTY_MEOW_SCRIPTS/system/add_apache_site.sh" "$APPLICATION_NAME" "$shadow_domain" + exit_on_error "Setting up shadow apache site on '$shadow_domain'" +fi + +sep + +# run this prior to the checkout to fix perms. +fix_appdir_ownership "$BASE_APPLICATION_PATH" "$APPLICATION_NAME" sep @@ -81,8 +95,6 @@ sep #echo default repo is "$DEFAULT_REPOSITORY_ROOT" powerup "$APPLICATION_NAME" "$REPO_NAME" "$THEME_NAME" -# pass the real user name who should own the files. -# "$(logname)" sep