Skip to content
Snippets Groups Projects
Commit 481870f9 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-4183 OZG-4584 rename usermanager to ozgcloud

parent d2ae76ff
No related branches found
No related tags found
No related merge requests found
Showing
with 41 additions and 48 deletions
......@@ -8,17 +8,17 @@ If you want to learn more about Quarkus, please visit its website: https://quark
This properties must be configured to run the application
| Key | Value | Default | Mandatory | Description |
|-----------------------------------------------|----------------------------------------------------|------------------------| --------- |----------------------------------------------------------------|
|----------------------------------------------------|----------------------------------------------------|------------------------| --------- |----------------------------------------------------------------|
| quarkus.oidc.auth-server-url | https://sso.dev.by.ozg-cloud.de/realms/sh-kiel-dev | none | yes | Url of the keycloak server with the realm |
| quarkus.mongodb.connection-string | mongodb://ozg-mongodb:27017 | none | yes | The connection string for the mongo db database |
| quarkus.mongodb.database | usermanager | usermanager | no | Name of the mongo db database |
| usermanager.keycloak.sync.period | 5m | 6h | no | Period between synchronizations |
| usermanager.keycloak.api.user | apiUser | none | yes | The name of the keycloak admin api user |
| usermanager.keycloak.api.password | **** | none | yes | The password of the keycloak admin api user |
| usermanager.keycloak.api.realm | realm-name | none | yes | The name of the realm |
| usermanager.keycloak.api.organisations-einheit-id-key | organisationseinheitId | organisationseinheitId | no | The key where the organisationsEinheitId of the group is saved |
| usermanager.keycloak.api.ldap-id-key | LDAP_ID | LDAP_ID | no | The key to get the keycloak user id from |
| usermanager.usermanager.url | http://localhost:8080 | none | yes | The external root url of the usermanager |
| ozgcloud.keycloak.sync.period | 5m | 6h | no | Period between synchronizations |
| ozgcloud.keycloak.api.user | apiUser | none | yes | The name of the keycloak admin api user |
| ozgcloud.keycloak.api.password | **** | none | yes | The password of the keycloak admin api user |
| ozgcloud.keycloak.api.realm | realm-name | none | yes | The name of the realm |
| ozgcloud.keycloak.api.organisations-einheit-id-key | organisationseinheitId | organisationseinheitId | no | The key where the organisationsEinheitId of the group is saved |
| ozgcloud.keycloak.api.ldap-id-key | LDAP_ID | LDAP_ID | no | The key to get the keycloak user id from |
| ozgcloud.usermanager.url | http://localhost:8080 | none | yes | The external root url of the usermanager |
| keycloak.url | https://sso.service | none | yes | The root url of the keycloak service |
## Running the application in dev mode
......@@ -47,7 +47,7 @@ use below configuration in your IDE or CLI.
```
-Dquarkus.profile=local,remotekc
-Dquarkus.oidc.auth-server-url=https://sso.dev.by.ozg-cloud.de/realms/sebo-test
-Dusermanager.keycloak.api.realm=sebo-test
-Dozgcloud.keycloak.api.realm=sebo-test
-Dozgcloud.usersync.period="5s"
```
......@@ -123,7 +123,7 @@ Usermanager als über-jar erstellen und lokal starten:
./mvnw clean package -Dquarkus.package.type=uber-jar
java -Dquarkus.oidc.auth-server-url=https://sso.dev.by.ozg-cloud.de/realms/by-kiel-dev \
-Dusermanager.user-manager.url=http://localhost:8080 \
-Dozgcloud.user-manager.url=http://localhost:8080 \
-Dkeycloak.url=https://sso.dev.by.ozg-cloud.de \
-jar ./target/user-manager-server-1.3.0-SNAPSHOT-runner.jar
```
......@@ -136,12 +136,12 @@ Usermanager als native Anwendung erstellen und lokal starten:
./target/user-manager-server-1.3.0-SNAPSHOT-runner \
-Dquarkus.oidc.auth-server-url=https://sso.dev.by.ozg-cloud.de/realms/by-kiel-dev \
-Dquarkus.mongodb.connection-string=mongodb://localhost:27018 \
-Dusermanager.user-manager.url=http://localhost:8080 \
-Dozgcloud.user-manager.url=http://localhost:8080 \
-Dkeycloak.url=https://sso.dev.by.ozg-cloud.de \
-Dusermanager.keycloak.api.user=usermanagerapiuser \
-Dusermanager.keycloak.api.password=hlc_j1I1Ji0trC0 \
-Dusermanager.keycloak.api.realm=by-kiel-dev \
-Dusermanager.keycloak.api.client=alfa \
-Dozgcloud.keycloak.api.user=usermanagerapiuser \
-Dozgcloud.keycloak.api.password=hlc_j1I1Ji0trC0 \
-Dozgcloud.keycloak.api.realm=by-kiel-dev \
-Dozgcloud.keycloak.api.client=alfa \
-Dozgcloud.usersync.period="5m" \
-Xmx32m
```
......
......@@ -7,5 +7,5 @@ metadata:
{{- include "app.defaultLabels" . | indent 4 }}
type: Opaque
stringData:
password: {{ required "usermanager.keycloak.api.password must be set" .Values.usermanager.keycloak.api.password }}
password: {{ required "ozgcloud.keycloak.api.password must be set" .Values.ozgcloud.keycloak.api.password }}
{{- end -}}
\ No newline at end of file
......@@ -71,7 +71,7 @@ spec:
key: password
optional: false
- name: USERMANAGER_KEYCLOAK_API_USER
value: {{ .Values.usermanager.keycloak.api.user }}
value: {{ .Values.ozgcloud.keycloak.api.user }}
{{- else }}
- name: USERMANAGER_KEYCLOAK_API_PASSWORD
valueFrom:
......
......@@ -34,7 +34,7 @@ image:
database: # username is always <release-name>-database-user
databaseName: user-manager-database
usermanager:
ozgcloud:
keycloak:
api:
user: userManagerApiUser
......
......@@ -29,7 +29,7 @@ kop:
bezeichner: helm
environment: test
usermanager:
ozgcloud:
keycloak:
api:
password: geheim
......
......@@ -61,7 +61,7 @@ public class UserProfileResource {
// TODO parameter in den resourceAssembler verschieben
// TODO wozu ist der eigentlich gut? - bitte aus Request übernehmen
@ConfigProperty(name = "usermanager.user-manager.url")
@ConfigProperty(name = "ozgcloud.user-manager.url")
String userManagerUrl;
@GET
......
......@@ -27,7 +27,7 @@ import jakarta.validation.constraints.NotBlank;
import io.smallrye.config.ConfigMapping;
@ConfigMapping(prefix = "usermanager.keycloak.api")
@ConfigMapping(prefix = "ozgcloud.keycloak.api")
public interface KeycloakApiProperties {
@NotBlank
......
......@@ -63,7 +63,7 @@ public class UserSettingsResource {
@Inject
UserSettingsResourceAssembler resourceAssembler;
@ConfigProperty(name = "usermanager.user-manager.url")
@ConfigProperty(name = "ozgcloud.user-manager.url")
String userManagerUrl;
@GET
......
......@@ -14,17 +14,15 @@ quarkus:
level: TRACE
min-level: TRACE
usermanager:
keycloak:
url: https://sso.dev.by.ozg-cloud.de
ozgcloud:
keycloak:
api:
user: userManagerApiUser
password: S9UEMuLG9y9ev99
realm: by-e2e-local-dev
client: alfa
keycloak:
url: https://sso.dev.by.ozg-cloud.de
ozgcloud:
usersync:
period: disabled
\ No newline at end of file
......@@ -6,7 +6,7 @@ quarkus:
console:
json: false
usermanager:
ozgcloud:
user-manager:
url: http://localhost:9092
......
......@@ -13,7 +13,7 @@ quarkus:
~: true
origins: http://localhost:4300
usermanager:
ozgcloud:
user-manager:
url: http://localhost:9092
keycloak:
......@@ -24,7 +24,5 @@ usermanager:
organisations-einheit-id-key: organisationseinheitId
client: alfa
ldap-id-key: LDAP_ID
ozgcloud:
usersync:
period: disabled
\ No newline at end of file
......@@ -36,7 +36,7 @@ grpc:
server:
enable-reflection-service: true
usermanager:
ozgcloud:
keycloak:
api:
ldap-id-key: LDAP_ID
......@@ -45,7 +45,5 @@ usermanager:
password: "-"
realm: by-kiel-dev
client: alfa
ozgcloud:
usersync:
period: "6h"
\ No newline at end of file
......@@ -29,13 +29,13 @@ import io.quarkus.test.junit.QuarkusTestProfile;
public class KeycloakTestProfile implements QuarkusTestProfile {
private final String userKey = "usermanager.keycloak.api.user";
private final String userKey = "ozgcloud.keycloak.api.user";
private final String userValue = "userManagerApiUser";
private final String passwordKey = "usermanager.keycloak.api.password";
private final String passwordKey = "ozgcloud.keycloak.api.password";
private final String passwordValue = "hlc_j1I1Ji0trC0";
private final String realmKey = "usermanager.keycloak.api.realm";
private final String realmKey = "ozgcloud.keycloak.api.realm";
private final String realmValue = "by-kiel-dev";
private final String urlKey = "keycloak.url";
......
......@@ -16,7 +16,10 @@ quarkus:
oidc:
auth-server-url: https://sso.dev.by.ozg-cloud.de/realms/by-kiel-dev
usermanager:
keycloak:
url: http://localhost:8088
ozgcloud:
keycloak:
api:
user: "-"
......@@ -27,9 +30,5 @@ usermanager:
client: alfa
user-manager:
url: http://localhost:9092
keycloak:
url: http://localhost:8088
ozgcloud:
usersync:
period: disabled
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment