wululu_web/docker-vsftpd
2
0
Fork 0
Code Packages Activity

Fix code styling

Browse Source
This commit is contained in:
Tim Robinson
2017-07-29 13:11:44 +10:00
parent 56675e6eec
commit a77eae39d3
2 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
add-virtual-user.sh
View File

@@ -2,22 +2,22 @@
set -e set -e
[ "$DEBUG" == 'true' ] && set -x [[ "${DEBUG}" == 'true' ]] && set -x
DB=/etc/vsftpd/virtual-users.db DB=/etc/vsftpd/virtual-users.db
if [ "$#" -lt 2 ] || [ "$#" -gt 3 ]; then if [[ "$#" -lt 2 || "$#" -gt 3 ]]; then
echo "Usage: $0 [-d] <user> <password>" >&2 echo "Usage: $0 [-d] <user> <password>" >&2
echo >&2 echo >&2
echo "[ -d ] Delete the database first" >&2 echo "[ -d ] Delete the database first" >&2
exit 1 exit 1
fi fi
if [ "$1" == "-d" ]; then if [[ "${1}" == "-d" ]]; then
if [ -f $DB ]; then if [[ -f "${DB}" ]]; then
rm $DB rm "${DB}"
fi fi
shift shift
fi fi
echo -e "$1\n$2" | db5.3_load -T -t hash $DB echo -e "${1}\n${2}" | db5.3_load -T -t hash "${DB}"

27
entry.sh
View File

@@ -2,33 +2,34 @@
set -e set -e
[ "$DEBUG" == 'true' ] && set -x [[ "${DEBUG}" == 'true' ]] && set -x
# Generate password if hash not set # Generate password if hash not set
if [ ! -z "$FTP_PASSWORD" -a -z "$FTP_PASSWORD_HASH" ]; then if [[ ! -z "${FTP_PASSWORD}" && -z "${FTP_PASSWORD_HASH}" ]]; then
FTP_PASSWORD_HASH=$(echo "$FTP_PASSWORD" | mkpasswd -s -m sha-512) FTP_PASSWORD_HASH=$(echo "${FTP_PASSWORD}" | mkpasswd -s -m sha-512)
fi fi
if [ ! -z "$FTP_USER" -a ! -z "$FTP_PASSWORD_HASH" ]; then if [[ ! -z "${FTP_USER}" && ! -z "${FTP_PASSWORD_HASH}" ]]; then
/add-virtual-user.sh -d "$FTP_USER" "$FTP_PASSWORD_HASH" echo "Adding user ${FTP_USER}"
/add-virtual-user.sh -d "${FTP_USER}" "${FTP_PASSWORD_HASH}"
fi fi
# Support multiple users # Support multiple users
while read user; do while read user; do
IFS=: read name pass <<< ${!user} IFS=: read name pass <<< "${!user}"
echo "Adding user $name" echo "Adding user ${name}"
/add-virtual-user.sh "$name" "$pass" /add-virtual-user.sh "${name}" "${pass}"
done < <(env | grep "FTP_USER_" | sed 's/^\(FTP_USER_[a-zA-Z0-9]*\)=.*/\1/') done < <(env | grep "FTP_USER_" | sed 's/^\(FTP_USER_[a-zA-Z0-9]*\)=.*/\1/')
# Support user directories # Support user directories
if [ ! -z "$FTP_USERS_ROOT" ]; then if [[ ! -z "${FTP_USERS_ROOT}" ]]; then
sed -i 's/local_root=.*/local_root=\/srv\/$USER/' /etc/vsftpd*.conf sed -i 's/local_root=.*/local_root=\/srv\/$USER/' "/etc/vsftpd*.conf"
fi fi
function vsftpd_stop { vsftpd_stop() {
echo "Received SIGINT or SIGTERM. Shutting down vsftpd" echo "Received SIGINT or SIGTERM. Shutting down vsftpd"
# Get PID # Get PID
pid=$(cat /var/run/vsftpd/vsftpd.pid) pid="$(cat /var/run/vsftpd/vsftpd.pid)"
# Set TERM # Set TERM
kill -SIGTERM "${pid}" kill -SIGTERM "${pid}"
# Wait for exit # Wait for exit
@@ -37,7 +38,7 @@ function vsftpd_stop {
echo "Done" echo "Done"
} }
if [ "$1" == "vsftpd" ]; then if [[ "$1" == "vsftpd" ]]; then
trap vsftpd_stop SIGINT SIGTERM trap vsftpd_stop SIGINT SIGTERM
echo "Running $@" echo "Running $@"
$@ & $@ &