From 5d573bb60b017068cf91fd9788a9376f7adcbc66 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Thu, 9 Nov 2017 17:19:40 -0500 Subject: [PATCH] swerved off into new branch now have the basics of standing up the whole app and site done. just want to make sure i don't clobber anything, and i wanted a development branch anyway. --- scripts/site_avenger/avcoreup.sh | 4 +- scripts/site_avenger/config/default.app | 12 +++++- scripts/site_avenger/powerup.sh | 4 +- scripts/site_avenger/sitepush.sh | 4 +- scripts/site_avenger/siteup.sh | 4 +- scripts/site_avenger/standup.sh | 51 +++++++++++++++++++++++-- 6 files changed, 65 insertions(+), 14 deletions(-) diff --git a/scripts/site_avenger/avcoreup.sh b/scripts/site_avenger/avcoreup.sh index 6462dea2..f7594949 100644 --- a/scripts/site_avenger/avcoreup.sh +++ b/scripts/site_avenger/avcoreup.sh @@ -7,8 +7,6 @@ export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory. -source "$WORKDIR/shared_site_mgr.sh" - ############################ # main body of script. @@ -16,6 +14,8 @@ source "$WORKDIR/shared_site_mgr.sh" # check for parameters. app_dirname="$1"; shift +source "$WORKDIR/shared_site_mgr.sh" + sep check_application_dir "$APPLICATION_DIR" diff --git a/scripts/site_avenger/config/default.app b/scripts/site_avenger/config/default.app index 4036883e..65e782d7 100644 --- a/scripts/site_avenger/config/default.app +++ b/scripts/site_avenger/config/default.app @@ -23,14 +23,22 @@ CHECKOUT_DIR_NAME="avenger5" # deployment information for the application / site. -APPLICATION_NAME="$(basename "$SITE_MANAGEMENT_CONFIG_FILE" .app)" +APPLICATION_NAME="${app_dirname}" echo app name was computed as $APPLICATION_NAME # change this if the site is on the "real" internet. -DOMAIN_NAME="$(basename "$SITE_MANAGEMENT_CONFIG_FILE" .app).vm" +DOMAIN_NAME="${app_dirname}.vm" echo domain name was computed as $DOMAIN_NAME +REPO_NAME="${app_dirname}.git" + +echo repo name was computed as $REPO_NAME + +THEME_NAME="$(capitalize_first_char "${app_dirname}.git")" + +echo theme name was computed as $THEME_NAME + #### diff --git a/scripts/site_avenger/powerup.sh b/scripts/site_avenger/powerup.sh index a72e06f1..998fcad5 100644 --- a/scripts/site_avenger/powerup.sh +++ b/scripts/site_avenger/powerup.sh @@ -22,8 +22,6 @@ export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory. -source "$WORKDIR/shared_site_mgr.sh" - ############################ function print_instructions() @@ -53,6 +51,8 @@ if [ "$app_dirname" == "-help" -o "$app_dirname" == "--help" ]; then print_instructions fi +source "$WORKDIR/shared_site_mgr.sh" + sep check_application_dir "$APPLICATION_DIR" diff --git a/scripts/site_avenger/sitepush.sh b/scripts/site_avenger/sitepush.sh index b2a7de2d..79156ea2 100644 --- a/scripts/site_avenger/sitepush.sh +++ b/scripts/site_avenger/sitepush.sh @@ -7,8 +7,6 @@ export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory. -source "$WORKDIR/shared_site_mgr.sh" - ############################ # main body of script. @@ -17,6 +15,8 @@ source "$WORKDIR/shared_site_mgr.sh" app_dirname="$1"; shift repo_name="$1"; shift +source "$WORKDIR/shared_site_mgr.sh" + sep check_application_dir "$APPLICATION_DIR" diff --git a/scripts/site_avenger/siteup.sh b/scripts/site_avenger/siteup.sh index 826d7d03..a63744be 100644 --- a/scripts/site_avenger/siteup.sh +++ b/scripts/site_avenger/siteup.sh @@ -7,8 +7,6 @@ export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory. -source "$WORKDIR/shared_site_mgr.sh" - ############################ # main body of script. @@ -17,6 +15,8 @@ source "$WORKDIR/shared_site_mgr.sh" app_dirname="$1"; shift repo_name="$1"; shift +source "$WORKDIR/shared_site_mgr.sh" + sep check_application_dir "$APPLICATION_DIR" diff --git a/scripts/site_avenger/standup.sh b/scripts/site_avenger/standup.sh index 3bb327f2..762bd1ef 100644 --- a/scripts/site_avenger/standup.sh +++ b/scripts/site_avenger/standup.sh @@ -8,8 +8,6 @@ export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory. -source "$WORKDIR/shared_site_mgr.sh" - ############################ function print_instructions() @@ -32,8 +30,12 @@ overridden by setting the SITE_MANAGEMENT_CONFIG_FILE environment variable." # check for parameters. app_dirname="$1"; shift -repo_name="$1"; shift -theme_name="$1"; shift + +if [ -z "$app_dirname" ]; then + print_instructions +fi + +source "$WORKDIR/shared_site_mgr.sh" if [ "$app_dirname" == "-help" -o "$app_dirname" == "--help" ]; then print_instructions @@ -43,6 +45,47 @@ sep check_application_dir "$APPLICATION_DIR" +add_domain "$DOMAIN_NAME" +test_or_die "Setting up domain: $DOMAIN_NAME" + +add_apache_site "$APPLICATION_NAME" "$DOMAIN_NAME" +test_or_die "Setting up apache site for: $APPLICATION_NAME" + +powerup "$APPLICATION_NAME" "$REPO_NAME" "$THEME_NAME" + + + + + +sep + +echo " +Finished standing up the full domain and site in: +${app_dirname}" + +#leave before old crud below +exit 0 + + + + + + + + + + + + + + + + + + + + +#below is probably not needed. # find proper webroot where the site will be initialized. if [ -z "$app_dirname" ]; then # no dir was passed, so guess it. -- 2.34.1