had to take an entirely different approach

[feisty_meow.git] / scripts / site_avenger / revamp_cakelampvm.sh

diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh
index a58b02c9cf8d8bc3d19a076ebbf16ce6f90290f0..8c902c3790064b612f0eb5100a48364eb22eadd0 100644 (file)
--- a/scripts/site_avenger/revamp_cakelampvm.sh
+++ b/scripts/site_avenger/revamp_cakelampvm.sh
@@ -20,6 +20,13 @@ source "$FEISTY_MEOW_SCRIPTS/system/common_sysadmin.sh"
 
 ##############
 
+echo "Regenerating feisty meow loading dock."
+
+reconfigure_feisty_meow
+test_or_die "feisty meow reconfiguration"
+
+##############
+
 echo "Making some important permission changes..."
 
 # fix up the main web storage.
@@ -75,12 +82,9 @@ fi
 
 # install a better editor app.
 
-echo "
-The script is about to install the bluefish editor and some dependencies.
+echo " The script is about to install the bluefish editor and some dependencies.
 If the app is not already installed, then this process takes only about a
-minute on a slower home DSL internet connection...
-
-"
+minute on a slower home DSL internet connection..."
 
 apt-get install -y bluefish &> "/tmp/install_bluefish-$(logname).log"
 test_or_continue "installing bluefish editor"
@@ -96,10 +100,13 @@ test_or_continue "installing bluefish editor"
 # site config files.  our original site was 000 and the new version is 001,
 # which we've done as a prefix on the config for some reason.  makes the
 # code below easy at least.
-if [ -l /etc/apache2/sites-enabled/000-default.conf ]; then
+if [ -L /etc/apache2/sites-enabled/000-default.conf ]; then
   # the old site is in place still, so let's update that.
   echo "Updating default web sites to latest version."
 
+  a2enmod ssl
+  test_or_die "enabling SSL for secure websites"
+
   a2dissite 000-default
   test_or_die "disabling old apache site"
 
@@ -127,22 +134,33 @@ echo Doing some git repository maintenance in fred account.
 pushd /home/fred
 test_or_die "changing dir to fred's home; what have you done with fred?"
 
-pushd apps/mapsdemo
+pushd apps/mapsdemo/avenger5
 test_or_die "changing dir to mapsdemo app"
 
-# gets rid of the old version of configs.
-git stash 
-test_or_die "stashing mapsdemo changes"
-git stash drop 
-test_or_die "dropping mapsdemo stash"
+rpuffer . &>/dev/null
+if [ $? -ne 0 ]; then
+  # it seems our old files are still conflicting this.
+  if [ -f config/config_google.php ]; then
+    \rm -f config/config_google.php
+    test_or_die "removing old config for google"
+  fi
+  if [ -f config/app.php ]; then
+    \rm -f config/app.php
+    test_or_die "removing old config for app"
+  fi
+
+  git reset --hard HEAD
+  test_or_die "resetting git's hard head"
+
+  rpuffer .
+#hmmm: use output saver thing when that exists.
+  test_or_die "puffing out mapsdemo app after inadequate corrective action was taken"
+fi
 
 popd
 
-rpuffer apps
-test_or_die "puffing out apps directory"
-
 popd
-#...coolness
+#...coolness, if we got to here.
 
 ##############