From 98933c26a5a982bb66789476c91a16c8dcf28c0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florent=20Thi=C3=A9ry?= <florent.thiery@ubicast.eu>
Date: Tue, 4 Apr 2017 19:45:16 +0200
Subject: [PATCH] auto create folders in create_ftp_account.sh
---
.../2.Install_FTP_watch_folder/0_setup.py | 2 +-
.../create_ftp_account.sh | 13 +++++++++++--
2 files changed, 12 insertions(+), 3 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 4739c0fe..db9c144d 100644
--- a/10.MediaFolder/2.Install_FTP_watch_folder/0_setup.py
+++ b/10.MediaFolder/2.Install_FTP_watch_folder/0_setup.py
@@ -56,7 +56,7 @@ def setup(interactive=True):
cmds.extend([
'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),
+ '"%s/create_ftp_account.sh" %s "%s"' % (dir_path, login, password),
])
cmds.extend([
'chmod -R 775 /home/ftp/storage/incoming',
diff --git a/10.MediaFolder/2.Install_FTP_watch_folder/create_ftp_account.sh b/10.MediaFolder/2.Install_FTP_watch_folder/create_ftp_account.sh
index a04ded37..54d27ddf 100755
--- a/10.MediaFolder/2.Install_FTP_watch_folder/create_ftp_account.sh
+++ b/10.MediaFolder/2.Install_FTP_watch_folder/create_ftp_account.sh
@@ -1,4 +1,13 @@
#!/bin/bash
+if [ $# -le 1 ]
+then
+ echo "Usage: create_account.sh username password"
+ exit 1
+fi
-# Usage: create_account.sh username password home
-echo -e "$2\n$2" | pure-pw useradd $1 -u ftp -d $3
+mkdir -p /home/ftp/storage/incoming/$1
+mkdir -p /home/ftp/storage/watchfolder/$1
+echo -e "$2\n$2" | pure-pw useradd $1 -u ftp -d /home/ftp/storage/incoming/$1
+chmod -R 775 /home/ftp/storage/incoming
+chmod -R 775 /home/ftp/storage/watchfolder
+chown -R ftp:ftp /home/ftp/storage
--
GitLab