From 53e4ad9605c9344694d801f16d17b35e41cf74c9 Mon Sep 17 00:00:00 2001
From: Ernst Widerberg <ernst@sunet.se>
Date: Wed, 24 Nov 2021 14:00:53 +0100
Subject: Generate a default htpasswd file on host

---
 auth-server-poc/docker-compose.yml |  5 +----
 quickstart.sh                      | 12 ++++++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/auth-server-poc/docker-compose.yml b/auth-server-poc/docker-compose.yml
index 1a43372..b73532c 100644
--- a/auth-server-poc/docker-compose.yml
+++ b/auth-server-poc/docker-compose.yml
@@ -7,8 +7,5 @@ services:
       - 8000:80
     volumes:
       - ${DOCKER_JWT_PUBKEY_PATH}:/opt/auth-server-poc/cert/
-      - auth-server-poc_userdb:/opt/auth-server-poc/userdb/
+      - ${DOCKER_JWT_HTPASSWD_PATH}:/opt/auth-server-poc/userdb/
     container_name: auth-server-poc
-
-volumes:
-  auth-server-poc_userdb:
diff --git a/quickstart.sh b/quickstart.sh
index adc98c4..8f62182 100755
--- a/quickstart.sh
+++ b/quickstart.sh
@@ -5,18 +5,30 @@ export COUCHDB_PASSWORD=test
 export COUCHDB_NAME=test
 export COUCHDB_HOSTNAME=couchdb
 export DOCKER_JWT_PUBKEY_PATH=/tmp/soc_collector/
+export DOCKER_JWT_HTPASSWD_PATH=/tmp/soc_collector_htpasswd/
 
 # Create a directory to store the certificates in.
 if [ ! -d ${DOCKER_JWT_PUBKEY_PATH} ]; then
     mkdir ${DOCKER_JWT_PUBKEY_PATH}
 fi
 
+# And for the htpasswd file.
+if [ ! -d ${DOCKER_JWT_HTPASSWD_PATH} ]; then
+    mkdir ${DOCKER_JWT_HTPASSWD_PATH}
+fi
+
+
 # Generate new certificates to use for JWT.
 if [ ! -f ${DOCKER_JWT_PUBKEY_PATH}/private.pem ] && [ ! -f ${DOCKER_JWT_PUBKEY_PATH}/public.pem ]; then
     openssl ecparam -genkey -name prime256v1 -noout -out ${DOCKER_JWT_PUBKEY_PATH}/private.pem
     openssl ec -in ${DOCKER_JWT_PUBKEY_PATH}/private.pem -pubout -out ${DOCKER_JWT_PUBKEY_PATH}/public.pem
 fi
 
+# Generate a default htpasswd file with a user "usr:pwd".
+if [ ! -f ${DOCKER_JWT_HTPASSWD_PATH}/.htpasswd ]; then
+    htpasswd -b -c ${DOCKER_JWT_HTPASSWD_PATH}/.htpasswd usr pwd
+fi
+
 # Launch the containers.
 docker-compose -f docker/docker-compose.yaml up -d
 docker-compose -f auth-server-poc/docker-compose.yml up -d
-- 
cgit v1.1