X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Frevamp_cakelampvm.sh;h=9afd92140f3d0aa2f717a58b31ec31dde6ca4f72;hb=5014baf97957923fc16403d4aa2614dd90d0f418;hp=53464faf539cc7cc7cc7669801a69efda9bebb99;hpb=8dd0a085b453b9ec087defa0a9ecb5b92fce03af;p=feisty_meow.git

diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh
index 53464faf..9afd9214 100644
--- a/scripts/site_avenger/revamp_cakelampvm.sh
+++ b/scripts/site_avenger/revamp_cakelampvm.sh
@@ -137,18 +137,55 @@ 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.
+# the https site for cakelampvm.com 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.
-search_replace "^[ 	]*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
+# 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
+  echo successfully patched the apache tls-enabling.conf file to disable strict transport security.  awesome.
 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
+  echo "successfully added wildcard domains to the cakelampvm.com bind configuration, so we're still on track for greatness."
+fi
+
+##############
+
+# fix samba configuration for (ass-headed) default of read-only in user homes.
+# why add a necessary feature if you're just going to cripple it by default?
+
+search_replace a b
+/etc/samba/smb.conf 
+if [ $? -ne 0 ]; then
+  echo "the samba configuration has already been fixed for user homes, so that's fine."
+else
+  restart_samba
+  echo successfully patched the samba configuration to enable writes on user home directories.  super cool.
+fi
+
+##############
 ##############
 
 # sequel--tell them they're great and show the hello again also.