[PC-BSD Commits] r1332 - in pbibuild/modules/vsftpd: . overlay-dir

[svn at pcbsd.org]

Author: gonzalo
Date: 2008-02-08 11:22:36 -0800 (Fri, 08 Feb 2008)
New Revision: 1332

Removed:
   pbibuild/modules/vsftpd/overlay-dir/vsftpdanon
Modified:
   pbibuild/modules/vsftpd/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/vsftpd/pbi.conf
Log:
vsftpd anonymous user fixed

Modified: pbibuild/modules/vsftpd/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/vsftpd/overlay-dir/PBI.SetupScript.sh	2008-02-08 19:14:57 UTC (rev 1331)
+++ pbibuild/modules/vsftpd/overlay-dir/PBI.SetupScript.sh	2008-02-08 19:22:36 UTC (rev 1332)
@@ -32,7 +32,15 @@
 	then 	
 	sed 's/anonymous_enable=NO/anonymous_enable=YES/g' vsftpd.conf > tempfile && mv -- tempfile vsftpd.conf
 	sed 's/local_enable=YES/local_enable=NO/g' vsftpd.conf > tempfile && mv -- tempfile vsftpd.conf
-	sh vsftpdanon
+	#vsftpdanon
+	pw user add -n ftp -c "FTP User" -m -s /sbin/nologin -w none
+	chmod 755 /Programs/${PROGDIR}/anon_ftp
+	cd /Programs/${PROGDIR}/anon_ftp
+	mkdir /Programs/${PROGDIR}/anon_ftp/Uploads
+	mkdir /Programs/${PROGDIR}/anon_ftp/Downloads
+	chmod 777 /Programs/${PROGDIR}/anon_ftp/Uploads
+	chmod 755 /Programs/${PROGDIR}/anon_ftp/Downloads
+	touch Success
 	fi
 	if [ "$USERS" = "b" ] 
 	then 	
@@ -43,7 +51,15 @@
 	then 	
 	sed 's/anonymous_enable=NO/anonymous_enable=YES/g' vsftpd.conf > tempfile && mv -- tempfile vsftpd.conf
 	sed 's/local_enable=NO/local_enable=YES/g' vsftpd.conf > tempfile && mv -- tempfile vsftpd.conf
-	sh vsftpdanon
+	#vsftpdanon
+	pw user add -n ftp -c "FTP User" -m -s /sbin/nologin -w none
+	chmod 755 /Programs/${PROGDIR}/anon_ftp
+	cd /Programs/${PROGDIR}/anon_ftp
+	mkdir /Programs/${PROGDIR}/anon_ftp/Uploads
+	mkdir /Programs/${PROGDIR}/anon_ftp/Downloads
+	chmod 777 /Programs/${PROGDIR}/anon_ftp/Uploads
+	chmod 755 /Programs/${PROGDIR}/anon_ftp/Downloads
+	touch Success
 	fi
 else 
 kdialog --title "vsftpd Server" --msgbox "No User specified. You will need to modify the vsftpd.conf"

Deleted: pbibuild/modules/vsftpd/overlay-dir/vsftpdanon

Modified: pbibuild/modules/vsftpd/pbi.conf
===================================================================
--- pbibuild/modules/vsftpd/pbi.conf	2008-02-08 19:14:57 UTC (rev 1331)
+++ pbibuild/modules/vsftpd/pbi.conf	2008-02-08 19:22:36 UTC (rev 1332)
@@ -32,6 +32,6 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="04"
+BUILDKEY="05"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY