Merge branch 'dev' of feistymeow.org:feisty_meow into dev

diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh
index 9db5eef39399a1bfbb9ca412a497b816e711e2f0..b1757c44ac1cb73574d4639613978c6417615027 100644 (file)
--- a/scripts/site_avenger/revamp_cakelampvm.sh
+++ b/scripts/site_avenger/revamp_cakelampvm.sh
@@ -136,6 +136,47 @@ 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
+
+##############
+
+# fix up bind so that we think of any address with cakelampvm.com on the end
+# as being on the vm.  this is already true for some specific sites, but we
+# want the wildcard enabled to ease the use of DNS for windows folks.
+
+grep -q "\*[[:blank:]]*IN A[[:blank:]]*10.28.42.20" /etc/bind/cakelampvm.com.conf
+if [ $? -eq 0 ]; then
+  # already present.
+  echo the bind settings for wildcard domains off of cakelampvm.com seems to already be present.  good deal.
+else
+  echo "
+; our bind magic, a wildcard domain, for all other sites with cakelampvm.com
+; in the domain.  this forces any other sites besides the ones above to route
+; to the actual vm IP address, which currently is singular and very fixated.
+*                              IN A            10.28.42.20
+                               IN HINFO        "linux vm" "ubuntu"
+" >> /etc/bind/cakelampvm.com.conf
+
+restart_bind
+
+##############
+
+
+
+
+
+##############
 ##############
 
 # sequel--tell them they're great and show the hello again also.