Several small bugfixes

Author: MaStr

customization/bin/ftp_enable.sh

@@ -125,7 +125,7 @@ generate() {
 
 	l_allow_sync="Include $OUTPUT_SYNC_CONF \n"
 	l_allow_anon="Include $OUTPUT_ANON_CONF \n"
- 	l_allow_admin="AllowUser  $BOX_USER"
+ 	l_allow_admin="AllowUser  $BOX_SYSTEM_USER"
 
 	sed  "s|#####HOSTNAME#####|$HOST|"  $SCHEMA_DEAMON_CONF > $OUTPUT_DAEMON_CONF
 
@@ -138,6 +138,7 @@ generate() {
 	sed  "s|#####PID#####|$PROFTPD_PID|" -i $OUTPUT_DAEMON_CONF
 	sed  "s|#####ADMIN_FOLDER#####|$ADMIN_FOLDER|" -i  $OUTPUT_DAEMON_CONF
 	sed  "s|#####BOX_SYSTEM_USER#####|$BOX_SYSTEM_USER|" -i $OUTPUT_DAEMON_CONF
+	sed  "s|#####BOX_SYSTEM_GROUP#####|$BOX_SYSTEM_GROUP|" -i $OUTPUT_DAEMON_CONF
 
 	#SYNC Stuff
 	sed  "s|#####HOSTNAME#####|$HOST|" $SCHEMA_SYNC_CONF  > $OUTPUT_SYNC_CONF
@@ -212,7 +213,7 @@ mainmenu() {
 			("h4")  print_help_anon ;;
 			(*)	_exit_menu_ ;;
 		esac
-		option = ""
+		option=""
 	done
 
 }

customization/bin/hooks/hook_piratebox_start_done.sh

@@ -18,6 +18,10 @@ fi
 
 if [ "$FTP_ENABLED" = "yes" ] ; then
 	echo "starting PROFTPD.."
+
+	# Load PirateBox config
+	. $PIRATEBOX_FOLDER/conf/ftp/ftp.conf
+
 	# $PROFTPD_CONFIG_FILE
 	# $PROFTPD_PID  #####PID#####
 

customization/conf/ftp/ftp.conf

@@ -7,6 +7,7 @@ ADMIN_ACCESS="yes"
 BOX_USER="boxadmin"
 ADMIN_FOLDER="$PIRATEBOX_FOLDER/share"
 BOX_SYSTEM_USER="nobody"
+BOX_SYSTEM_GROUP="nogroup"
 
 #----------------------------------------------
 # Enable special Port for System-Syncronisation

customization/conf/ftp/proftpd.conf.schema

@@ -15,12 +15,13 @@ Group                           nogroup
 
 AuthUserFile                    /etc/shadow
 
-DefaultChdir                     /mnt/
+# Only changes directory
+#DefaultChdir                     /mnt/
 
 <IfDefine AdminAccess>
 	AllowOverwrite  on
 	UserAlias #####BOX_USER#####  #####BOX_SYSTEM_USER#####
-	DefaultRoot  #####ADMIN-FOLDER#####      #####BOX_SYSTEM_USER#####
+	DefaultRoot  #####ADMIN_FOLDER#####      #####BOX_SYSTEM_GROUP#####
 	<Limit LOGIN>
 	 DenyAll
 	 #####ADMIN_ACCESS#####
@@ -65,7 +66,7 @@ TransferRate  APPE,RETR,STOR,STOU  2048:10485760 user ftp
 TransferRate  APPE,RETR,STOR,STOU  2048:10485760 user nobody
 
 # Upload-Throttle for flow USB Stick for > admin user
-#TransferRate  STOR 250:300:10485760 user #####BOX_SYSTEM_USER#####
+TransferRate  STOR 250:10485760 user #####BOX_SYSTEM_USER#####
 
 
 <IfDefine AnonAccess>