user-init: Support $HOME/websites/* style web hierarchy.

1 files changed, 17 insertions, 3 deletions

diff --git a/user-init b/user-init
index a839816..fd85be0 100755
--- a/user-init
+++ b/user-init
@@ -203,11 +203,25 @@ for user in $USERS; do
 #		chmod -R u=rw,go=r,a+X $webdir
 #TODO: Only cgi scripts (.cgi and .pl) should be executable
 		chmod -R u+rw,go+r,a+X $dir
+		# leftover from ancient times with another policy
+		if [ $NETATALK ]; then
+			rm -rf $dir/Network\ Trash\ Folder
+		fi
+	done
+	
+	# Web shares permissions
+	for dir in `find $HOME -mindepth 1 -maxdepth 1 -type d | egrep "^$HOME/websites"`; do
+		chown root: $dir
+		chmod u+rw,go+r,a+X $dir
+	done
+		for dir in `find $HOME -mindepth 2 -maxdepth 2 -type d | egrep "^$HOME/websites/"`; do
+		chown -R $user: $dir
+#		chmod -R u=rw,go=r,a+X $webdir
+#TODO: Only cgi scripts (.cgi and .pl) should be executable
+		chmod -R u+rw,go+r,a+X $dir
+		# leftover from ancient times with another policy
 		if [ $NETATALK ]; then
 			rm -rf $dir/Network\ Trash\ Folder
-			mkdir $dir/Network\ Trash\ Folder
-			chown nobody: $dir/Network\ Trash\ Folder
-			chmod a= $dir/Network\ Trash\ Folder
 		fi
 	done