From: Chris Koeritz <fred@gruntose.com>
Date: Thu, 2 Nov 2017 13:39:31 +0000 (-0400)
Subject: more cleanups on apache site adder
X-Git-Tag: 2.140.90~115
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=c3e5c57ab153bcb6151e24adc2b3d2f507c512bb;p=feisty_meow.git

more cleanups on apache site adder

nearly ready for prime time.
---

diff --git a/scripts/system/add_apache_site.sh b/scripts/system/add_apache_site.sh
index fe77ae7c..a9c21f92 100644
--- a/scripts/system/add_apache_site.sh
+++ b/scripts/system/add_apache_site.sh
@@ -105,7 +105,7 @@ echo full path is $full_path
   fi
   # now give the web server some access to the folder.  this is crucial since the folders
   # can be hosted in any user folder, and the group permissions will usually be only for the user.
-  chown -R $USER:www-data "$BASE_PATH"
+  chown -R $(logname):www-data "$BASE_PATH"
   check_result "Failed to set www-data as the owner on the path: $full_path"
   # note that web serving will also hose up unless the path to the folder is writable.  so we walk backwards
   # and make sure group access is available.
@@ -115,8 +115,9 @@ echo chow path is now $chow_path
     chmod -R g+rx "$chow_path"
     check_result "Failed to add group permissions for www-data on the path: $chow_path"
     # reassert the user's ownership of any directories we might have just created.
-    chown $USER "$chow_path"
+    chown $(logname) "$chow_path"
     check_result "changing ownership to user failed on the path: $chow_path"
+echo just chowned $chow_path for user $(logname)
     chow_path="$(dirname "$chow_path")"
   done
 }