user-init: Improvements and corrections to web_*, ftp_* and mac_* shares (and lock TrashCan again - it still doesn't work correctly in netatalk).

1 files changed, 42 insertions, 22 deletions

diff --git a/user-init b/user-init
index 20c431d..b144807 100755
--- a/user-init
+++ b/user-init
@@ -113,33 +113,53 @@ for USER in $USERS; do
 		chown nobody: $HOME/$mac/Network\ Trash\ Folder
 		chmod a= $HOME/$mac/Network\ Trash\ Folder
 	fi
-	
+
 	# Access to Mac folders
-	for macdir in `find $HOME -mindepth 1 -maxdepth 1 -type d | egrep "^$HOME/mac_$USER$"`; do
-		chgrp -R $USER $macdir
-		chmod -R u=rw,g=rw,o=,ug+X,g+s $macdir
+	for dir in `find $HOME -mindepth 1 -maxdepth 1 -type d | egrep "^$HOME/mac_$USER$"`; do
+		chgrp -R $USER $dir
+		chmod -R u=rw,g=rw,o=,ug+X,g+s $dir
+		rm -rf $dir/Network\ Trash\ Folder
+		mkdir $dir/Network\ Trash\ Folder
+		chown nobody: $dir/Network\ Trash\ Folder
+		chmod a= $dir/Network\ Trash\ Folder
 	done
-	for macdir in `find $HOME -mindepth 1 -maxdepth 1 -type d | egrep "^$HOME/mac_${USER}_ro$"`; do
-		chown -R $USER: $macdir
-		chmod -R u=rw,g=r,o=,ug+X $macdir
-	done
-	
-	# Content cleanup of Mac folders
-	for macdir in `find $HOME -mindepth 2 -maxdepth 2 -type d | egrep "^$HOME/mac_$USER/"`; do
-		rm -rf $macdir/Network\ Trash\ Folder
-		mkdir $macdir/Network\ Trash\ Folder
-		chown nobody: $macdir/Network\ Trash\ Folder
-		chmod a= $macdir/Network\ Trash\ Folder
+	for dir in `find $HOME -mindepth 1 -maxdepth 1 -type d | egrep "^$HOME/mac_${USER}_ro$"`; do
+		chown -R $USER: $dir
+		chmod -R u=rw,g=r,o=,ug+X $dir
+		rm -rf $dir/Network\ Trash\ Folder
+		mkdir $dir/Network\ Trash\ Folder
+		chown nobody: $dir/Network\ Trash\ Folder
+		chmod a= $dir/Network\ Trash\ Folder
 	done
-	
+
 	# Access to ftp folders
-	for ftpdir in `find $HOME -mindepth 1 -maxdepth 1 -type d | egrep "^$HOME/ftp_$USER$"`; do
-		chgrp -R $USER $ftpdir
-		chmod -R ug=rw,o=r,a+X,g+s $ftpdir
+	for dir in `find $HOME -mindepth 1 -maxdepth 1 -type d | egrep "^$HOME/ftp_$USER$"`; do
+		chgrp -R $USER $dir
+		chmod -R ug=rw,o=r,a+X,g+s $dir
+		rm -rf $dir/Network\ Trash\ Folder
+		mkdir $dir/Network\ Trash\ Folder
+		chown nobody: $dir/Network\ Trash\ Folder
+		chmod a= $dir/Network\ Trash\ Folder
 	done
-	for ftpdir in `find $HOME -mindepth 1 -maxdepth 1 -type d | egrep "^$HOME/ftp_${USER}_ro$"`; do
-		chown -R $USER: $ftpdir
-		chmod -R u=rw,go=r,a+X $ftpdir
+	for dir in `find $HOME -mindepth 1 -maxdepth 1 -type d | egrep "^$HOME/ftp_${USER}_ro$"`; do
+		chown -R $USER: $dir
+		chmod -R u=rw,go=r,a+X $dir
+		rm -rf $dir/Network\ Trash\ Folder
+		mkdir $dir/Network\ Trash\ Folder
+		chown nobody: $dir/Network\ Trash\ Folder
+		chmod a= $dir/Network\ Trash\ Folder
+	done
+
+	# Access to web folders
+	for dir in `find $HOME -mindepth 1 -maxdepth 1 -type d | egrep "^$HOME/web_"`; 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
+		rm -rf $dir/Network\ Trash\ Folder
+		mkdir $dir/Network\ Trash\ Folder
+		chown nobody: $dir/Network\ Trash\ Folder
+		chmod a= $dir/Network\ Trash\ Folder
 	done
 	
 	if [ -d $HOME/$pc ]; then