From da632f7f07a370a2e74d5c68b369911b5aa30c69 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Thu, 9 Nov 2017 16:30:32 -0500 Subject: [PATCH] refining the config includes approach --- .../config/default-site_avenger.config | 23 +++++++++++++++++++ .../config/winterportlibrary.config | 7 ++++++ .../configs/default-site_avenger.config | 8 ------- scripts/site_avenger/shared_site_mgr.sh | 2 +- 4 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 scripts/site_avenger/config/default-site_avenger.config create mode 100644 scripts/site_avenger/config/winterportlibrary.config delete mode 100644 scripts/site_avenger/configs/default-site_avenger.config diff --git a/scripts/site_avenger/config/default-site_avenger.config b/scripts/site_avenger/config/default-site_avenger.config new file mode 100644 index 00000000..4b57ebae --- /dev/null +++ b/scripts/site_avenger/config/default-site_avenger.config @@ -0,0 +1,23 @@ + +# this config file provides the default values for the variables used in our site management scripts. + +# basic information... +APPLICATION_DIR="$HOME/apps" +DEFAULT_REPOSITORY_ROOT="git@github.com:kwentworth" +CHECKOUT_DIR_NAME="avenger5" + +# most config files will only need to override things below this line. +# they should include the basic configs using this code: +# source $WORKDIR/config/default-site_avenger.config +###################################################################### + +# deployment information... +APPLICATION_NAME=mapsdemo + +# change this if the site is on the "real" internet. otherwise, for any +# sites that are served from the cakelampvm.com vm, the derived config +# files can just repeat this code. they *MUST* include it though, since +# it needs to see their version of the APPLICATION_NAME variable. +DOMAIN_NAME="${APPLICATION_NAME}.vm" + + diff --git a/scripts/site_avenger/config/winterportlibrary.config b/scripts/site_avenger/config/winterportlibrary.config new file mode 100644 index 00000000..1365e422 --- /dev/null +++ b/scripts/site_avenger/config/winterportlibrary.config @@ -0,0 +1,7 @@ + +source $WORKDIR/config/default-site_avenger.config + +APPLICATION_NAME=winterportlibrary +DOMAIN_NAME="${APPLICATION_NAME}.vm" + + diff --git a/scripts/site_avenger/configs/default-site_avenger.config b/scripts/site_avenger/configs/default-site_avenger.config deleted file mode 100644 index b5467dc6..00000000 --- a/scripts/site_avenger/configs/default-site_avenger.config +++ /dev/null @@ -1,8 +0,0 @@ - -# this script provides the default values for the variables used in our site management scripts. - -APPLICATION_DIR="$HOME/apps" -DEFAULT_REPOSITORY_ROOT="git@github.com:kwentworth" -CHECKOUT_DIR_NAME="avenger5" - - diff --git a/scripts/site_avenger/shared_site_mgr.sh b/scripts/site_avenger/shared_site_mgr.sh index 41b033fe..cef784e5 100644 --- a/scripts/site_avenger/shared_site_mgr.sh +++ b/scripts/site_avenger/shared_site_mgr.sh @@ -14,7 +14,7 @@ source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh" # get our configuration loaded. export SITE_MANAGEMENT_CONFIG_FILE if [ -z "$SITE_MANAGEMENT_CONFIG_FILE" ]; then - SITE_MANAGEMENT_CONFIG_FILE="$WORKDIR/configs/default-site_avenger.config" + SITE_MANAGEMENT_CONFIG_FILE="$WORKDIR/config/default-site_avenger.config" fi source "$SITE_MANAGEMENT_CONFIG_FILE" test_or_die "loading site management configuration from: $SITE_MANAGEMENT_CONFIG_FILE" -- 2.34.1