X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Frevamp_cakelampvm.sh;h=a646a85e0aaf2c365c9d3af807872b2c1a766974;hb=cc4c86985dfd130a7bd6b31a93a3655c268cb4c6;hp=2280dc952ae6bbddfa3e0ef33b5250ec95218591;hpb=504eaa2fbc6405d0721a0f3b872b996f17c353bf;p=feisty_meow.git

diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh
index 2280dc95..a646a85e 100644
--- a/scripts/site_avenger/revamp_cakelampvm.sh
+++ b/scripts/site_avenger/revamp_cakelampvm.sh
@@ -20,6 +20,17 @@ 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.
 chown -R www-data:www-data /var/www 
 test_or_die "chown www-data"
@@ -29,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"
@@ -41,14 +52,20 @@ 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."
 
 ##############
 #
@@ -57,6 +74,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,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"
@@ -90,8 +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"
 
@@ -110,12 +134,34 @@ if [ -l /etc/apache2/sites-enabled/000-default.conf ]; then
   restart_apache
 fi
 
+##############
+
+# fix up the apache site so that HSTS is disabled.  otherwise we can't view
+# https site once the domain name switch has occurred.
+
+# we operate only on our own specialized tls conf file.  hopefully no one has messed with it besides revamp.
+# note the use of the character class :blank: below to match spaces or tabs.
+search_replace "^[[:blank:]]*Header always set Strict-Transport-Security.*" "# not good for cakelampvm.com -- Header always set Strict-Transport-Security \"max-age=63072000; includeSubdomains;\"" /etc/apache2/conf-library/tls-enabling.conf
+if [ $? -ne 0 ]; then
+  echo the apache tls-enabling.conf file seems to have already been patched to disable strict transport security.  good.
+else
+  echo successfully patched the apache tls-enabling.conf file to disable strict transport security.  awesome.
+  restart_apache
+fi
+
+
 ##############
 
 # 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 "