Skip to content

Commit

Permalink
Cleanup documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
jkroepke committed Mar 15, 2020
1 parent 606a44f commit 11c3c4b
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 17 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ tool to configure keycloak via json file
The config files are based on the keycloak export files. You can use them to re-import your settings.
But keep your files as small as possible. Remove all UUIDs and all stuff which is default set by keycloak.

[moped.json](./example-config/moped.json) is a full working example file you can consider.
[moped.json](./contrib/example-config/moped.json) is a full working example file you can consider.
Other examples are located in the [test resources](./config-cli/src/test/resources/import-files).

## Compatibility matrix
Expand Down Expand Up @@ -61,7 +61,7 @@ $ java -jar ./target/config-cli.jar \
--keycloak.sslVerify=true \
--keycloak.user=admin \
--keycloak.password=admin123 \
--import.file=./example-config/moped.json
--import.file=./contrib/example-config/moped.json
```

### Docker
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:
networks:
- keycloak
volumes:
- ./example-config:/config
- ./contrib/example-config:/config
environment:
- KEYCLOAK_URL=http://keycloak:8080
- KEYCLOAK_ADMIN=admin
Expand Down
21 changes: 9 additions & 12 deletions docker/root/usr/local/bin/config-cli
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
#!/usr/bin/env sh
set -eu

if [ -z "${KEYCLOAK_URL+x}" ]
then
echo "Missing KEYCLOAK_URL environment variable"
exit 1
if [ -z "${KEYCLOAK_URL+x}" ]; then
echo "Missing KEYCLOAK_URL environment variable"
exit 1
fi

if [ -z "${KEYCLOAK_ADMIN+x}" ]
then
echo "Missing KEYCLOAK_ADMIN environment variable"
exit 1
if [ -z "${KEYCLOAK_ADMIN+x}" ]; then
echo "Missing KEYCLOAK_ADMIN environment variable"
exit 1
fi

if [ -z "${KEYCLOAK_ADMIN_PASSWORD+x}" ]
then
echo "Missing KEYCLOAK_ADMIN_PASSWORD environment variable"
exit 1
if [ -z "${KEYCLOAK_ADMIN_PASSWORD+x}" ]; then
echo "Missing KEYCLOAK_ADMIN_PASSWORD environment variable"
exit 1
fi

echo "Wait until keycloak is available ..."
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/application-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ keycloak:
password: admin123

import:
path: ./example-config
file: ./example-config/moped.json
path: ./contrib/example-config
file: ./contrib/example-config/moped.json

spring:
profiles:
Expand Down

0 comments on commit 11c3c4b

Please sign in to comment.