fixed pattern replace for hsts

[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 ff9f0b1c7c547245fd03932366dce72fd6b3398f..a646a85e0aaf2c365c9d3af807872b2c1a766974 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"
 
 ##############
 
@@ -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..."
 
@@ -132,6 +136,20 @@ 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.
@@ -141,6 +159,9 @@ 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 "