version update and fix proftpd config

copy/tmp/proftpd.conf

@@ -43,9 +43,16 @@ SQLAuthenticate users
 # MySQL queries
 # username, passwd, uid, gid, homedir, shell
 SQLNamedQuery get-user-by-name SELECT "ftp.name, ftp.password, WWW_UID as uid, WWW_GID as gid, CONCAT('/var/www/', domain.name, '/', ftp.path) as homedir, '/bin/false' as shell FROM ftp_account ftp, kumquat_domain domain WHERE ftp.domain_id = domain.id AND ftp.name = '%U'"
-SQLNamedQuery get-user-by-id SELECT "ftp.name, ftp.password, WWW_UID as uid, WWW_GID as gid, CONCAT('/var/www/', domain.name, '/', ftp.path) as homedir, '/bin/false' as shell FROM ftp_account ftp, kumquat_domain domain WHERE ftp.domain_id = domain.id AND ftp.id = %{0}"
+SQLNamedQuery get-user-by-id SELECT "'www' as name, 847 as uid, 847 as gid, '/var/www' as homedir, '/bin/false' as shell"
 SQLUserInfo custom:/get-user-by-name/get-user-by-id
 
+# Default MySQL / UID values
+SQLMinID WWW_UID
+SQLDefaultGID WWW_GID
+
+# We don't need a valid shell for MySQL authentication
+RequireValidShell off
+
 # TLS/SSL
 TLSEngine                on
 TLSProtocol              SSLv23

customize

@@ -2,7 +2,7 @@
 #
 # Put customizations to your image in this file.
 
-KUMQUAT_VERSION='0.1.3'
+KUMQUAT_VERSION='0.1.4'
 
 PATH=/opt/local/gnu/bin:/opt/local/bin:/opt/local/sbin:/usr/bin:/usr/sbin