added shadow site and more vamps

there is now a shadow site blah.cakelampvm.com for every site blah.X, implemented in both standup and teardown but untested.
revamp adds apache env vars file now.

diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh
index dd9ca88259de39b5fe79ee04b88904266fb86db6..8bd5eeee411cc5237e60287310788415f2716083 100644 (file)
--- a/scripts/site_avenger/revamp_cakelampvm.sh
+++ b/scripts/site_avenger/revamp_cakelampvm.sh
@@ -132,8 +132,9 @@ if [ -L /etc/apache2/sites-enabled/000-default.conf ]; then
   rm -f /etc/apache2/sites-available/000-default.conf 
   test_or_die "removing old apache site"
 
-  # copy in our new 000 version (which  
-  cp $FEISTY_MEOW_APEX/production/sites/cakelampvm.com/rolling/default_page.001/* \
+  # copy in our new version of the default page.
+#hmmm: would be nice if this worked without mods for any new version, besides just 001.  see apache env var file below for example implem.
+  cp -f $FEISTY_MEOW_APEX/production/sites/cakelampvm.com/rolling/default_page.001/* \
       /etc/apache2/sites-available
   test_or_die "installing new apache default sites"
 
@@ -217,10 +218,29 @@ mysql -u root -p "$mysql_passwd" <<EOF
 
   create user 'lampcake'@'%' IDENTIFIED BY 'bakecamp';
   grant all privileges on *.* TO 'lampcake'@'%' with grant option;
-
 EOF
 test_or_die "configuring root, wampcake and lampcake users on mysql"
 
+##############
+
+# add the latest version of the cakelampvm environment variables for apache.
+
+echo Setting up environment variables for apache2...
+
+# drop existing file, if already configured.  ignore errors.
+a2disconf env_vars_cakelampvm
+
+# plug in the new version, just stomping anything there.
+# note: we only expect to have one version of the env_vars dir at a time in place in feisty...
+cp -f $FEISTY_MEOW_APEX/production/sites/cakelampvm.com/rolling/env_vars.*/env_vars_cakelampvm.conf /etc/apache2/conf-available
+test_or_die "copying environment variables file into place"
+
+# enable the new version of the config file.
+a2enconf env_vars_cakelampvm
+test_or_die "enabling the new cakelampvm environment config for apache"
+
+echo Successfully configured the apache2 environment variables needed for cakelampvm.
+
 ##############
 ##############
 

diff --git a/scripts/site_avenger/standup.sh b/scripts/site_avenger/standup.sh
index c31a33d8390e0e11487dec439146a08e780d3cdb..5adfcc63375aa07001e8e5b2818fc526a52c56bc 100644 (file)
--- a/scripts/site_avenger/standup.sh
+++ b/scripts/site_avenger/standup.sh
@@ -72,9 +72,17 @@ test_or_die "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"
 
+# 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"
+  test_or_die "Setting up shadow apache site on '$shadow_domain'"
+fi
+
 sep
 
 #echo about to do powerup with: app="$APPLICATION_NAME" repo="$REPO_NAME" theme="$THEME_NAME"

diff --git a/scripts/site_avenger/teardown.sh b/scripts/site_avenger/teardown.sh
index 3e194083baa03488ab4705dd7edd9b30619b82a0..5bfcbd4699b9a01696af8f4a85ebd8e6b9bb2252 100644 (file)
--- a/scripts/site_avenger/teardown.sh
+++ b/scripts/site_avenger/teardown.sh
@@ -62,6 +62,13 @@ sep
 sudo bash "$FEISTY_MEOW_SCRIPTS/system/remove_apache_site.sh" "$DOMAIN_NAME"
 test_or_die "dropping apache site for: $DOMAIN_NAME"
 
+# drop the shadow site too.
+shadow_domain="${APPLICATION_NAME}.cakelampvm.com"
+if [ "$shadow_domain" != "$DOMAIN_NAME" ]; then
+  sudo bash "$FEISTY_MEOW_SCRIPTS/system/remove_apache_site.sh" "$shadow_domain"
+  test_or_die "dropping shadow apache site on '$shadow_domain'"
+fi
+
 sep
 
 #echo "!! domain being removed is: $DOMAIN_NAME"