actually was in wrong folder still

[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 748ea23e6332d71a9efdec4f0d90f96a1d89c94a..77c4d91255dee82abdfac8254003bee7485b083d 100644 (file)
--- a/scripts/site_avenger/revamp_cakelampvm.sh
+++ b/scripts/site_avenger/revamp_cakelampvm.sh
@@ -20,6 +20,15 @@ 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.
 chown -R www-data:www-data /var/www 
 test_or_die "chown www-data"
@@ -50,6 +59,8 @@ test_or_die "chown feisty meow to fred"
 group_perm /opt/feistymeow.org 
 test_or_die "group perms on feisty meow"
 
+echo "Done with important permission changes."
+
 ##############
 #
 # some slightly tricky bits start here.  we want to massage the vm into the
@@ -57,6 +68,8 @@ test_or_die "group perms on feisty meow"
 #
 ##############
 
+echo "Updating developer welcome file."
+
 # only update hello if they've still got the file there.  we don't want to
 # keep forcing our hellos at people.
 if [ -f "$HOME/hello.txt" ]; then
@@ -69,48 +82,74 @@ 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"
 
 ##############
 
+# deploy any site updates here to the VM's cakelampvm.com site.
+#
 # we want to upgrade the default apache site to the latest, since the new
 # version mirrors the one on the internet (but with green checks instead
 # of red X's) and since we also support https on the new default version.
 # we can do this again later if needed, by upping the numbers on the apache
-# site config files.
-if [ -l /etc/apache2/sites-enabled/000-default.conf ]; then
+# 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
   # 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"
 
   rm -f /etc/apache2/sites-available/000-default.conf 
   test_or_die "removing old apache site"
 
-  cp $FEISTY_MEOW_APEX/production/sites/cakelampvm/
-uhhh
-two files for new config
+  # copy in our new 000 version (which  
+  cp $FEISTY_MEOW_APEX/production/sites/cakelampvm.com/rolling/default_page.001/* \
+      /etc/apache2/sites-available
   test_or_die "installing new apache default sites"
 
-  a2ensite
-thos two configs
+  # there should only be ours at this version level and with that prefix.
+  a2ensite 001-*
   test_or_die "enabling new apache default sites"
 
   restart_apache
+fi
+
+##############
 
+# clean out some old files that were not checked in in mapsdemo.
+echo Doing some git repository maintenance in fred account.
+#
+# change over to fred folder
+pushd /home/fred
+test_or_die "changing dir to fred's home; what have you done with fred?"
 
-fi
+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 unwanted mapsdemo changes"
+git stash drop 
+# intentionally ignore error, if there was nothing to drop.
+
+popd
 
-#hmmm: todo
-# deploy the site updater here to fix the local cakelampvm.com site...
+rpuffer apps
+test_or_die "puffing out apps directory"
 
+popd
+#...coolness
 
 ##############