[PC-BSD Commits] r12336 - in pbi/modules/ftp/vsftpd: . resources scripts

svn at pcbsd.org svn at pcbsd.org
Fri Aug 26 10:04:03 PDT 2011


Author: kenmoore
Date: 2011-08-26 10:04:03 -0700 (Fri, 26 Aug 2011)
New Revision: 12336

Added:
   pbi/modules/ftp/vsftpd/resources/anon_ftp/
Modified:
   pbi/modules/ftp/vsftpd/pbi.conf
   pbi/modules/ftp/vsftpd/scripts/post-install.sh
Log:
Fix a couple issues with the install script and require root install for vsftpd


Modified: pbi/modules/ftp/vsftpd/pbi.conf
===================================================================
--- pbi/modules/ftp/vsftpd/pbi.conf	2011-08-26 16:57:24 UTC (rev 12335)
+++ pbi/modules/ftp/vsftpd/pbi.conf	2011-08-26 17:04:03 UTC (rev 12336)
@@ -22,5 +22,7 @@
 PBI_MAKEPORT="ftp/vsftpd"
 
 BUILDKEY="01"; export BUILDKEY
+
+PBI_REQUIRESROOT="YES"; export PBI_REQUIRESROOT
  
 export PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MAKEPORT

Modified: pbi/modules/ftp/vsftpd/scripts/post-install.sh
===================================================================
--- pbi/modules/ftp/vsftpd/scripts/post-install.sh	2011-08-26 16:57:24 UTC (rev 12335)
+++ pbi/modules/ftp/vsftpd/scripts/post-install.sh	2011-08-26 17:04:03 UTC (rev 12336)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-sed -i.bak "s,CHANGEME,${PBI_PROGDIRPATH},g" /Programs/${PBI_PROGDIRPATH}/vsftpdcfg
+sed -i.bak "s,CHANGEME,${PBI_PROGDIRPATH},g" ${PBI_PROGDIRPATH}/vsftpdcfg
 
 
 echo "vsftpd_enable=\"YES\"" >> /etc/rc.conf
@@ -10,7 +10,7 @@
 then 
 	if [ "$USERS" != "b" ] 
 	then
-		sed -u.bak 's/anonymous_enable=NO/anonymous_enable=YES/g' ${PBI_PROGDIRPATH}/vsftpd.conf
+		sed -i.bak 's/anonymous_enable=NO/anonymous_enable=YES/g' ${PBI_PROGDIRPATH}/vsftpd.conf
 		#vsftpdanon
 		pw user add -n ftp -c "FTP User" -m -s /sbin/nologin -w none
 		chmod 755 ${PBI_PROGDIRPATH}/anon_ftp



More information about the Commits mailing list