From 33942f43a2d7c1e5d7b091bd11ab5cb9d320e8f1 Mon Sep 17 00:00:00 2001
From: Chris Koeritz <fred@gruntose.com>
Date: Sun, 12 Nov 2017 22:10:28 -0500
Subject: [PATCH] getting configs right

---
 scripts/site_avenger/config/default.app  | 16 ++++++----------
 scripts/site_avenger/config/mapsdemo.app |  4 ++--
 scripts/site_avenger/shared_site_mgr.sh  |  5 ++++-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/scripts/site_avenger/config/default.app b/scripts/site_avenger/config/default.app
index 4fe8303c..a7b9e909 100644
--- a/scripts/site_avenger/config/default.app
+++ b/scripts/site_avenger/config/default.app
@@ -1,6 +1,11 @@
 #!/bin/bash
 
-# this config file provides the default values for the variables used in our site management scripts.
+# provides the default values for the variables used in our site management scripts.
+
+# config files for site avenger apps usually override nothing, since we
+# auto-construct the app name and domain.
+# if they do need to override anything, they can just specify replacement
+# values for the variables in this file.
 
 ####
 
@@ -12,15 +17,6 @@ export CHECKOUT_DIR_NAME="avenger5"
 
 ####
 
-# config files for site avenger apps usually override nothing, since we
-# auto-construct the app name and domain.  but if they do need to override
-# anything, it will be below this point in the file.
-# the derived config file should include the basic configs like so:
-#
-#   source "$WORKDIR/config/default.app"
-
-####
-
 # deployment information for the application / site.
 
 export APPLICATION_NAME="${app_dirname}"
diff --git a/scripts/site_avenger/config/mapsdemo.app b/scripts/site_avenger/config/mapsdemo.app
index ab89231b..34fe6ce8 100644
--- a/scripts/site_avenger/config/mapsdemo.app
+++ b/scripts/site_avenger/config/mapsdemo.app
@@ -3,8 +3,8 @@
 # a special override for the mapsdemo site, which we want to put in as
 # a subdomain of the cakelampvm domain.
 
-source "$WORKDIR/config/default.app"
-
 export DOMAIN_NAME="${APPLICATION_NAME}.cakelampvm.com"
 
 
+echo "*** overrode domain name as: $DOMAIN_NAME"
+
diff --git a/scripts/site_avenger/shared_site_mgr.sh b/scripts/site_avenger/shared_site_mgr.sh
index 3c03ccbe..5f3ca164 100644
--- a/scripts/site_avenger/shared_site_mgr.sh
+++ b/scripts/site_avenger/shared_site_mgr.sh
@@ -16,6 +16,8 @@ source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 export SITE_MANAGEMENT_CONFIG_FILE
 if [ -z "$SITE_MANAGEMENT_CONFIG_FILE" ]; then
   SITE_MANAGEMENT_CONFIG_FILE="$WORKDIR/config/default.app"
+  echo "Site management config file was not set.  Using default:"
+  echo "  $SITE_MANAGEMENT_CONFIG_FILE"
 fi
 
 # load in at least the default version to get us moving.
@@ -88,6 +90,7 @@ function find_app_folder()
   echo "Application folder is: $app_dirname"
 
   local configfile="$WORKDIR/config/${app_dirname}.app"
+echo hoping config file would be: $configfile
   if [ ! -f "$configfile" ]; then
     # this is not a good config file.  we can't auto-guess the config.
     echo -e "
@@ -99,7 +102,7 @@ the standard pattern for cakephp projects."
     # reinitialize some variables based on the app name.
   else
     # they gave us a valid config file.  let's try using it.
-    SITE_MANAGEMENT_CONFIG_FILE="$configfile"
+    export SITE_MANAGEMENT_CONFIG_FILE="$configfile"
   fi
 
   # try to load the config.
-- 
2.34.1