From: Chris Koeritz <fred@gruntose.com>
Date: Sun, 17 Dec 2017 13:26:00 +0000 (-0500)
Subject: slightly tastier
X-Git-Tag: 2.140.106^2~24
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=5014baf97957923fc16403d4aa2614dd90d0f418;p=feisty_meow.git

slightly tastier

fixed the recent bind section, since it was not closed properly.
added restart_samba function.
added code for fixing samba config for user dirs to have write access; not done yet.
---

diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh
index 239a7f14..9afd9214 100644
--- a/scripts/site_avenger/revamp_cakelampvm.sh
+++ b/scripts/site_avenger/revamp_cakelampvm.sh
@@ -145,8 +145,8 @@ search_replace "^[[:blank:]]*Header always set Strict-Transport-Security.*" "# n
 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
 
 ##############
@@ -167,11 +167,23 @@ else
 *				IN A		10.28.42.20
 				IN HINFO	"linux vm" "ubuntu"
 " >> /etc/bind/cakelampvm.com.conf
-
-restart_bind
+  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
 
 ##############
 ##############
diff --git a/scripts/system/common_sysadmin.sh b/scripts/system/common_sysadmin.sh
index 4ab80ed3..7f831e21 100644
--- a/scripts/system/common_sysadmin.sh
+++ b/scripts/system/common_sysadmin.sh
@@ -186,6 +186,25 @@ function restart_bind()
 
 ############################################################################
 
+# samba server helper functions...
+
+function restart_samba
+{
+  echo restarting samba server.
+  service smbd restart
+  if [ $? -ne 0 ]; then
+    echo "The samba service did not restart properly.  Please check the error logs."
+    exit 1
+  fi
+  service nmbd restart
+  if [ $? -ne 0 ]; then
+    echo "The samba name service (nmbd) did not restart properly.  This may not always be fatal, so we are ignoring it, but you may want to check the error logs."
+  fi
+  echo samba service restarted.
+}
+
+############################################################################
+
 # apache2 methods...
 
 # removes a config file for apache given the app name and site name.