Skip to content

Commit 8bff09c

Browse files
author
Your Name
committed
done
1 parent 070f699 commit 8bff09c

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

modules/FTP_server

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ anon_container_name="anon_ftp_server"
1818
default_anon_root="$HOME"
1919
user_container_name="user_ftp_server"
2020
startUID=10000
21-
mnt_poin="/ftp/"
21+
mnt_poin="/ftp"
2222
fdeleted_uid="$DOCKSRC/$user_container_name/deleted.uid"
2323
fcurrent_uid="$DOCKSRC/$user_container_name/current.uid"
2424
tmp_ifs="$IFS"
@@ -65,7 +65,6 @@ delete_server() {
6565
}
6666

6767
power() {
68-
set -x
6968
loading
7069
case "$2" in
7170
on)
@@ -109,9 +108,9 @@ add_user() {
109108
--title "Add User" \
110109
--mixedform "Root directory must be absolute" 0 0 2 \
111110
"uid(UserID) username: password: root directory:" 1 1 "" 1 37 0 0 2 \
112-
"uid($uid)" 1 1 "" 1 13 16 0 0 \
113-
"" 1 1 "" 1 30 16 0 0 \
114-
"" 1 1 "" 1 47 25 0 0 )"
111+
"uid($uid)" 2 1 "" 2 13 16 0 0 \
112+
"" 2 1 "" 2 30 16 0 0 \
113+
"" 2 1 "" 2 47 50 0 0 )"
115114
set -- $output
116115
username=" $1"
117116
password="$2"
@@ -120,8 +119,13 @@ add_user() {
120119
msg "This username already exists"
121120
return
122121
fi
123-
str="$username|$password|$rootdir|$uid"
124-
sed "s:$users:$users$str:" < $file > "$file.$$" && mv "$file.$$" $file
122+
str="$username|$password|$mnt_poin/$rootdir|$uid"
123+
if [ -z "$users" ]; then
124+
sed "s: - USERS=: - USERS=$str:" < $file > "$file.$$" && mv "$file.$$" $file
125+
else
126+
sed "s:$users:$users$str:" < $file > "$file.$$" && mv "$file.$$" $file
127+
fi
128+
echo " - $rootdir:$mnt_poin/$rootdir" >> "$file"
125129

126130
if [ $getfromdeleted -eq 1 ]; then
127131
tail -n +2 "$fdeleted_uid" > "$fdeleted_uid.$$" && mv "$fdeleted_uid.$$" "$fdeleted_uid"
@@ -144,7 +148,6 @@ delete_user() {
144148
}
145149

146150
user_management() {
147-
file="$DOCKSRC/$user_container_name/docker-compose.yml"
148151
while :; do
149152
users="$(grep -oP "USERS=\K.*" $file)"
150153
if [ -z "$users" ]; then
@@ -172,8 +175,9 @@ user_management() {
172175
done
173176
}
174177

175-
# set -x
178+
set -x
176179

180+
file="$DOCKSRC/$user_container_name/docker-compose.yml"
177181
if [ -z "$(ls -A $DOCKSRC)" ]; then
178182
if ! dialog --backtitle "$backtitle" --title "No server found!" --yesno "You don't have server\nDo you want to create?" 0 0; then
179183
exit 0
@@ -224,7 +228,7 @@ while :; do
224228
power "$anon_container_name" "on"
225229
;;
226230
2)
227-
if ! grep -qoP "USERS=\K.*" $file ; then
231+
if [ -z "$(grep -oP "USERS=\K.*" $file)" ]; then
228232
msg "No user found on server. You must add at least one user to turn on server in User-mod"
229233
add_user
230234
fi

share/ftp_server/user/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ services:
1313
ipv4_address: tmp_ip
1414
restart: unless-stopped
1515
environment:
16-
- USERS=name|password|/root/dir|10001 name|password|/root/dir|10001
16+
- USERS=
1717
volumes:

0 commit comments

Comments
 (0)