X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fsite_avenger%2Frevamp_cakelampvm.sh;h=9db5eef39399a1bfbb9ca412a497b816e711e2f0;hb=afef5e5127c1a2ef7362f2d705c39a9b1cbb910e;hp=a58b02c9cf8d8bc3d19a076ebbf16ce6f90290f0;hpb=db991d4b96cd811a0d7f673eb3bbe9154a101f45;p=feisty_meow.git

diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh
index a58b02c9..9db5eef3 100644
--- 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"
+chown -R "$(logname)":"$(logname)" /home/$(logname)/.[a-zA-Z0-9]*
+test_or_die "fix after reconfigured as sudo"
+
+##############
+
 echo "Making some important permission changes..."
 
 # fix up the main web storage.
@@ -31,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"
@@ -43,14 +52,18 @@ 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"
 harsh_perm /home/fred/.ssh
 test_or_die "harsh_perm setting on fred .ssh"
 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."
 
@@ -75,12 +88,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 +106,16 @@ 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"
+
+  restart_apache
+  test_or_die "getting SSL loaded in apache"
+
   a2dissite 000-default
   test_or_die "disabling old apache site"
 
@@ -120,36 +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
-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"
-
-popd
-
-rpuffer apps
-test_or_die "puffing out apps directory"
-
-popd
-#...coolness
-
 ##############
 
 # 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 "