From d02ced0523f7e4ef10925db4db17b0148fd24545 Mon Sep 17 00:00:00 2001 From: Sebastian Wiedenroth Date: Mon, 29 Sep 2014 16:35:49 +0200 Subject: [PATCH 1/2] don't hardcode WWW_UID/GID --- copy/tmp/proftpd.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/copy/tmp/proftpd.conf b/copy/tmp/proftpd.conf index 3cad283..c5d2029 100644 --- a/copy/tmp/proftpd.conf +++ b/copy/tmp/proftpd.conf @@ -42,8 +42,8 @@ SQLAuthenticate users # MySQL queries # username, passwd, uid, gid, homedir, shell -SQLNamedQuery get-user-by-name SELECT "DISTINCT ftp.name, ftp.password, 847 as uid, 847 as gid, IF(ftp.vhost_id is Null, '/var/www', CONCAT('/var/www/', vhost.name, '.', domain.name, '/', ftp.path) ) as homedir, '/bin/false' as shell FROM ftp_account ftp, kumquat_domain domain, web_vhost vhost WHERE ((ftp.vhost_id = vhost.id AND vhost.domain_id = domain.id) OR ftp.vhost_id is NULL) AND ftp.name = '%U'" -SQLNamedQuery get-user-by-id SELECT "'www' as name, 847 as uid, 847 as gid, '/var/www' as homedir, '/bin/false' as shell" +SQLNamedQuery get-user-by-name SELECT "DISTINCT ftp.name, ftp.password, WWW_UID as uid, WWW_GID as gid, IF(ftp.vhost_id is Null, '/var/www', CONCAT('/var/www/', vhost.name, '.', domain.name, '/', ftp.path) ) as homedir, '/bin/false' as shell FROM ftp_account ftp, kumquat_domain domain, web_vhost vhost WHERE ((ftp.vhost_id = vhost.id AND vhost.domain_id = domain.id) OR ftp.vhost_id is NULL) AND ftp.name = '%U'" +SQLNamedQuery get-user-by-id SELECT "'www' as name, WWW_UID as uid, WWW_GID as gid, '/var/www' as homedir, '/bin/false' as shell" SQLUserInfo custom:/get-user-by-name/get-user-by-id # Default MySQL / UID values From eb9cbecc83b9938528483be848f64c786c73ba64 Mon Sep 17 00:00:00 2001 From: Sebastian Wiedenroth Date: Mon, 29 Sep 2014 21:20:15 +0200 Subject: [PATCH 2/2] bump kumquat version includes fix for global ftp users and use input type=password for password fields --- customize | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/customize b/customize index 31f3b94..f3f868f 100755 --- a/customize +++ b/customize @@ -2,7 +2,7 @@ # # Put customizations to your image in this file. -KUMQUAT_VERSION='0.1.16' +KUMQUAT_VERSION='0.1.17' PATH=/opt/local/gnu/bin:/opt/local/bin:/opt/local/sbin:/usr/bin:/usr/sbin