diff options
| author | Kristofer Hallin <kristofer@sunet.se> | 2022-01-18 13:22:25 +0100 |
|---|---|---|
| committer | Kristofer Hallin <kristofer@sunet.se> | 2022-01-18 13:22:25 +0100 |
| commit | 5ee4799c88c48097e09b48b6afceb43571f07aaf (patch) | |
| tree | def8a83e7202d287890761bb2047ab78b85a9882 /quickstart.sh | |
| parent | bb5029d512a58021718061aca439383c8b11e575 (diff) | |
| parent | 88b1a1aa213cc70443254a05f2a8968fb7c43a48 (diff) | |
Resolved conflict.
Diffstat (limited to 'quickstart.sh')
| -rwxr-xr-x | quickstart.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/quickstart.sh b/quickstart.sh index edf8c43..950475b 100755 --- a/quickstart.sh +++ b/quickstart.sh @@ -22,12 +22,17 @@ 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 user1 pwd + htpasswd -b -c ${DOCKER_JWT_HTPASSWD_PATH}/.htpasswd usr pwd + htpasswd -b ${DOCKER_JWT_HTPASSWD_PATH}/.htpasswd user1 pwd htpasswd -b ${DOCKER_JWT_HTPASSWD_PATH}/.htpasswd user2 pwd htpasswd -b ${DOCKER_JWT_HTPASSWD_PATH}/.htpasswd user3 pwd htpasswd -b ${DOCKER_JWT_HTPASSWD_PATH}/.htpasswd user4 pwd fi +if [ ! -f ${DOCKER_JWT_HTPASSWD_PATH}/userdb.yaml ]; then + cp auth-server-poc/userdb.yaml ${DOCKER_JWT_HTPASSWD_PATH}/userdb.yaml +fi + # Launch the containers. docker-compose -f docker/docker-compose-dev.yaml up -d docker-compose -f auth-server-poc/docker-compose.yml up -d |