From b4544d929aa4fffe2af657f41a4087752d732603 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florent=20Thi=C3=A9ry?= <florent.thiery@ubicast.eu>
Date: Fri, 24 Mar 2017 14:14:46 +0100
Subject: [PATCH] fix moving script
---
10.MediaFolder/2.Install_FTP_watch_folder/0_setup.py | 4 ++--
10.MediaFolder/2.Install_FTP_watch_folder/on_ftp_upload.py | 7 +------
2 files changed, 3 insertions(+), 8 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 1c63cbf0..bd2ffbc8 100644
--- a/10.MediaFolder/2.Install_FTP_watch_folder/0_setup.py
+++ b/10.MediaFolder/2.Install_FTP_watch_folder/0_setup.py
@@ -22,9 +22,9 @@ def setup(interactive=True):
'cp "%s/create_ftp_account.sh" /usr/local/bin' % (dir_path),
'mkdir -p /home/ftp/storage',
'mkdir -p /home/ftp/storage/incoming',
- 'mkdir -p /home/ftp/storage/hotfolder',
+ 'mkdir -p /home/ftp/storage/watchfolder',
'chmod -R 775 /home/ftp/storage/incoming',
- 'chmod -R 775 /home/ftp/storage/hotfolder',
+ 'chmod -R 775 /home/ftp/storage/watchfolder',
# Config
'echo "no" > /etc/pure-ftpd/conf/AllowDotFiles',
'echo "yes" > /etc/pure-ftpd/conf/CallUploadScript',
diff --git a/10.MediaFolder/2.Install_FTP_watch_folder/on_ftp_upload.py b/10.MediaFolder/2.Install_FTP_watch_folder/on_ftp_upload.py
index 2b6ee58c..57ab8a7e 100755
--- a/10.MediaFolder/2.Install_FTP_watch_folder/on_ftp_upload.py
+++ b/10.MediaFolder/2.Install_FTP_watch_folder/on_ftp_upload.py
@@ -10,7 +10,7 @@ import unicodedata
BASE_DIR = '/home/ftp/storage/'
INCOMING_DIR = BASE_DIR + 'incoming/'
-DEST_DIR = BASE_DIR + 'hotfolder/'
+DEST_DIR = BASE_DIR + 'watchfolder/'
ALLOWED_CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-.'
LOG_FILE = '/home/ftp/on_ftp_upload.log'
@@ -57,11 +57,6 @@ if __name__ == '__main__':
sys.exit(0)
dest_path = src_path.replace(INCOMING_DIR, DEST_DIR)
- ftpuser = os.environ.get('UPLOAD_USER')
- if ftpuser:
- dest_path = os.path.join(dest_path, ftpuser)
- else:
- logging.warning('No ftp user specified, will move into generic folder %s' % dest_path)
if not os.path.exists(os.path.dirname(dest_path)):
os.system('mkdir -p -m 775 "%s"' % os.path.dirname(dest_path))
--
GitLab