From c80485eac58fc8942fec139af590e58f9ca0b2a5 Mon Sep 17 00:00:00 2001
From: jo <ljonas@riseup.net>
Date: Thu, 7 Nov 2019 17:45:50 +0100
Subject: [PATCH] Force bcrypt htpassword / format docker script

---
 docker/create_user   | 10 +++++-----
 docker/delete_user   |  4 ++--
 docker/entrypoint.sh | 18 +++++++++---------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/docker/create_user b/docker/create_user
index 6dc1b11..469c2ff 100755
--- a/docker/create_user
+++ b/docker/create_user
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 if [ -z "$1" ]; then
-    echo "create_user [username]"
-    echo "or"
-    echo "create_user [username] [password]"
-    exit 1
+  echo "create_user [username]"
+  echo "or"
+  echo "create_user [username] [password]"
+  exit 1
 fi
 
-htpasswd -s $PASSWORD_FILE $1 $2
+htpasswd -B $PASSWORD_FILE $1 $2
diff --git a/docker/delete_user b/docker/delete_user
index c3c25ec..735943a 100755
--- a/docker/delete_user
+++ b/docker/delete_user
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 if [ -z "$1" ]; then
-    echo "delete_user [username]"
-    exit 1
+  echo "delete_user [username]"
+  exit 1
 fi
 
 htpasswd -D $PASSWORD_FILE $1
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index c2a5724..015c21c 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -3,17 +3,17 @@
 set -e
 
 if [ -z "$DISABLE_AUTHENTICATION" ]; then
-    if [ ! -f "$PASSWORD_FILE" ]; then
-        touch "$PASSWORD_FILE"
-    fi
+  if [ ! -f "$PASSWORD_FILE" ]; then
+    touch "$PASSWORD_FILE"
+  fi
 
-    if [ ! -s "$PASSWORD_FILE" ]; then
-        echo
-        echo "**WARNING** No user exists, please 'docker exec -it \$CONTAINER_ID create_user'"
-        echo
-    fi
+  if [ ! -s "$PASSWORD_FILE" ]; then
+    echo
+    echo "**WARNING** No user exists, please 'docker exec -it \$CONTAINER_ID create_user'"
+    echo
+  fi
 else
-    rm -f "$PASSWORD_FILE"
+  rm -f "$PASSWORD_FILE"
 fi
 
 exec rest-server --path "$DATA_DIRECTORY" $OPTIONS