Force bcrypt htpassword / format docker script

This commit is contained in:
jo 2019-11-07 17:45:50 +01:00
parent 3b304faef6
commit c80485eac5
3 changed files with 16 additions and 16 deletions

View file

@ -1,10 +1,10 @@
#!/bin/sh #!/bin/sh
if [ -z "$1" ]; then if [ -z "$1" ]; then
echo "create_user [username]" echo "create_user [username]"
echo "or" echo "or"
echo "create_user [username] [password]" echo "create_user [username] [password]"
exit 1 exit 1
fi fi
htpasswd -s $PASSWORD_FILE $1 $2 htpasswd -B $PASSWORD_FILE $1 $2

View file

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
if [ -z "$1" ]; then if [ -z "$1" ]; then
echo "delete_user [username]" echo "delete_user [username]"
exit 1 exit 1
fi fi
htpasswd -D $PASSWORD_FILE $1 htpasswd -D $PASSWORD_FILE $1

View file

@ -3,17 +3,17 @@
set -e set -e
if [ -z "$DISABLE_AUTHENTICATION" ]; then if [ -z "$DISABLE_AUTHENTICATION" ]; then
if [ ! -f "$PASSWORD_FILE" ]; then if [ ! -f "$PASSWORD_FILE" ]; then
touch "$PASSWORD_FILE" touch "$PASSWORD_FILE"
fi fi
if [ ! -s "$PASSWORD_FILE" ]; then if [ ! -s "$PASSWORD_FILE" ]; then
echo echo
echo "**WARNING** No user exists, please 'docker exec -it \$CONTAINER_ID create_user'" echo "**WARNING** No user exists, please 'docker exec -it \$CONTAINER_ID create_user'"
echo echo
fi fi
else else
rm -f "$PASSWORD_FILE" rm -f "$PASSWORD_FILE"
fi fi
exec rest-server --path "$DATA_DIRECTORY" $OPTIONS exec rest-server --path "$DATA_DIRECTORY" $OPTIONS