added fix for mapsdemo

[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 950ad5bcae0a763c1d5e2eb766ba5dd9784fe101..9db5eef39399a1bfbb9ca412a497b816e711e2f0 100644 (file)
--- a/scripts/site_avenger/revamp_cakelampvm.sh
+++ b/scripts/site_avenger/revamp_cakelampvm.sh
@@ -24,6 +24,8 @@ echo "Regenerating feisty meow loading dock."
 
 reconfigure_feisty_meow
 test_or_die "feisty meow reconfiguration"
+chown -R "$(logname)":"$(logname)" /home/$(logname)/.[a-zA-Z0-9]*
+test_or_die "fix after reconfigured as sudo"
 
 ##############
 
@@ -38,7 +40,7 @@ test_or_die "group_perm www-data"
 ##############
 
 # set up access on some important folders for the developer user.
-chown -R developer:developer /home/developer
+chown -R developer:developer /home/developer /home/developer/.[a-zA-Z0-9]*
 test_or_die "chown developer home"
 harsh_perm /home/developer/.ssh
 test_or_die "harsh_perm setting on developer .ssh"
@@ -50,7 +52,7 @@ test_or_die "group perms on apache2 and bind"
 ##############
 
 # fix perms for fred user.
-chown -R fred:fred /home/fred /home/archives/stuffing 
+chown -R fred:fred /home/fred /home/archives/stuffing /home/fred/.[a-zA-Z0-9]*
 test_or_die "chown fred home"
 group_perm $HOME/apps
 test_or_die "group perms on fred's apps"
@@ -60,6 +62,8 @@ chown -R fred:fred /opt/feistymeow.org
 test_or_die "chown feisty meow to fred"
 group_perm /opt/feistymeow.org 
 test_or_die "group perms on feisty meow"
+group_perm /home/fred/apps/mapsdemo
+test_or_die "group perms on mapsdemo app"
 
 echo "Done with important permission changes."
 
@@ -84,7 +88,7 @@ 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..."
 
@@ -109,6 +113,9 @@ if [ -L /etc/apache2/sites-enabled/000-default.conf ]; then
   a2enmod ssl
   test_or_die "enabling SSL for secure websites"
 
+  restart_apache
+  test_or_die "getting SSL loaded in apache"
+
   a2dissite 000-default
   test_or_die "disabling old apache site"
 
@@ -129,47 +136,18 @@ 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?"
-
-pushd apps/mapsdemo/avenger5
-test_or_die "changing dir to mapsdemo app"
-
-rgetem . &>/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"
-
-  rgetem .
-#hmmm: use output saver thing when that exists.
-  test_or_die "getting mapsdemo app after inadequate corrective action was taken"
-fi
-
-popd
-
-popd
-#...coolness, if we got to here.
-
 ##############
 
 # sequel--tell them they're great and show the hello again also.
 
-regenerate
+echo "
 
+
+"
+regenerate
+test_or_die "regenerating feisty meow scripts"
+chown -R "$(logname)":"$(logname)" /home/$(logname)/.[a-zA-Z0-9]*
+test_or_die "fix after regenerate as sudo"
 echo "