From dd08b70f40d1b45bc904915ef750ec64ab05acd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florent=20Thi=C3=A9ry?= <florent.thiery@ubicast.eu>
Date: Tue, 4 Apr 2017 18:27:27 +0200
Subject: [PATCH] support specifying custom subfolder in FTP_INCOMING_USERS var
---
10.MediaFolder/2.Install_FTP_watch_folder/0_setup.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/10.MediaFolder/2.Install_FTP_watch_folder/0_setup.py b/10.MediaFolder/2.Install_FTP_watch_folder/0_setup.py
index 641e9d3c..4739c0fe 100644
--- a/10.MediaFolder/2.Install_FTP_watch_folder/0_setup.py
+++ b/10.MediaFolder/2.Install_FTP_watch_folder/0_setup.py
@@ -47,9 +47,15 @@ def setup(interactive=True):
]
for ftpuser in ftpincoming_users:
login, password = ftpuser.split(':')
+ # FTP_INCOMING_USERS='user/subfolder:pass
+ if '/' in login:
+ folder = login
+ login = login.split('/')[0]
+ else:
+ folder = login
cmds.extend([
- 'mkdir -p /home/ftp/storage/incoming/%s' % login,
- 'mkdir -p /home/ftp/storage/watchfolder/%s' % login,
+ 'mkdir -p /home/ftp/storage/incoming/%s' % folder,
+ 'mkdir -p /home/ftp/storage/watchfolder/%s' % folder,
'"%s/create_ftp_account.sh" %s "%s" /home/ftp/storage/incoming/%s' % (dir_path, login, password, login),
])
cmds.extend([
--
GitLab