Skip to content
Snippets Groups Projects
Commit 1024055f authored by OZGCloud's avatar OZGCloud
Browse files

OZG-4183 OZG-4583 rename config params

parent f90c7f47
No related branches found
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 36 additions and 3942 deletions
README.md
+ 14
− 14
View file @ 1024055f
......@@ -12,13 +12,13 @@ This properties must be configured to run the application
| 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 |
| kop.keycloak.sync.period | 5m | 6h | no | Period between synchronizations |
| kop.keycloak.api.user | apiUser | none | yes | The name of the keycloak admin api user |
| kop.keycloak.api.password | **** | none | yes | The password of the keycloak admin api user |
| kop.keycloak.api.realm | realm-name | none | yes | The name of the realm |
| kop.keycloak.api.organisations-einheit-id-key | organisationseinheitId | organisationseinheitId | no | The key where the organisationsEinheitId of the group is saved |
| kop.keycloak.api.ldap-id-key | LDAP_ID | LDAP_ID | no | The key to get the keycloak user id from |
| kop.usermanager.url | http://localhost:8080 | none | yes | The external root url of the usermanager |
| 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 |
| 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
-Dkop.keycloak.api.realm=sebo-test
-Dusermanager.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 \
-Dkop.user-manager.url=http://localhost:8080 \
-Dusermanager.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 \
-Dkop.user-manager.url=http://localhost:8080 \
-Dusermanager.user-manager.url=http://localhost:8080 \
-Dkeycloak.url=https://sso.dev.by.ozg-cloud.de \
-Dkop.keycloak.api.user=usermanagerapiuser \
-Dkop.keycloak.api.password=hlc_j1I1Ji0trC0 \
-Dkop.keycloak.api.realm=by-kiel-dev \
-Dkop.keycloak.api.client=alfa \
-Dusermanager.keycloak.api.user=usermanagerapiuser \
-Dusermanager.keycloak.api.password=hlc_j1I1Ji0trC0 \
-Dusermanager.keycloak.api.realm=by-kiel-dev \
-Dusermanager.keycloak.api.client=alfa \
-Dozgcloud.usersync.period="5m" \
-Xmx32m
```
......
user-manager-server/src/main/java/de/itvsh/kop/user/UserProfileResource.java
+ 1
− 1
View file @ 1024055f
......@@ -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 = "kop.user-manager.url")
@ConfigProperty(name = "usermanager.user-manager.url")
String userManagerUrl;
@GET
......
user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiProperties.java
+ 1
− 1
View file @ 1024055f
......@@ -27,7 +27,7 @@ import jakarta.validation.constraints.NotBlank;
import io.smallrye.config.ConfigMapping;
@ConfigMapping(prefix = "kop.keycloak.api")
@ConfigMapping(prefix = "usermanager.keycloak.api")
public interface KeycloakApiProperties {
@NotBlank
......
user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsResource.java
+ 1
− 1
View file @ 1024055f
......@@ -63,7 +63,7 @@ public class UserSettingsResource {
@Inject
UserSettingsResourceAssembler resourceAssembler;
@ConfigProperty(name = "kop.user-manager.url")
@ConfigProperty(name = "usermanager.user-manager.url")
String userManagerUrl;
@GET
......
user-manager-server/src/main/resources/application-e2e.yaml
+ 1
− 1
View file @ 1024055f
......@@ -14,7 +14,7 @@ quarkus:
level: TRACE
min-level: TRACE
kop:
usermanager:
keycloak:
api:
user: userManagerApiUser
......
user-manager-server/src/main/resources/application-local.yaml
+ 3
− 1
View file @ 1024055f
......@@ -5,8 +5,10 @@ quarkus:
log:
console:
json: false
kop:
usermanager:
user-manager:
url: http://localhost:9092
keycloak:
url: http://localhost:8088
\ No newline at end of file
user-manager-server/src/main/resources/application-remotekc.yaml
+ 3
− 1
View file @ 1024055f
keycloak:
url: https://sso.dev.by.ozg-cloud.de
realm: by-kiel-dev
quarkus:
mongodb:
database: usermanager
......@@ -11,7 +12,8 @@ quarkus:
cors:
~: true
origins: http://localhost:4300
kop:
usermanager:
user-manager:
url: http://localhost:9092
keycloak:
......
user-manager-server/src/main/resources/application.yaml
+ 5
− 2
View file @ 1024055f
......@@ -5,9 +5,10 @@
ssl:
certificate: /user-manager-tls-certificate/tls.crt
key: /user-manager-tls-certificate/tls.key
quarkus:
application:
name: kopusermanager
name: ozgcloud_usermanager
http:
cors:
~: true
......@@ -30,10 +31,12 @@ quarkus:
level: INFO
mongodb:
database: usermanager
grpc:
server:
enable-reflection-service: true
kop:
usermanager:
keycloak:
api:
ldap-id-key: LDAP_ID
......
user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CallContextInterceptorTestFactory.java
+ 1
− 1
View file @ 1024055f
......@@ -10,7 +10,7 @@ import io.grpc.MethodDescriptor;
public class CallContextInterceptorTestFactory {
private static final String CLIENT_NAME = "Client - Goofy";
private static final String CLIENT_NAME = "Client - Alfa";
private static final String ORGANISATIONS_EINHEIT_ID = "organisationsEinheitId";
private static final Boolean ORGANISATIONS_EINEHIT_ID_CHECK_NECESSARY = Boolean.TRUE;
......
user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakTestProfile.java
+ 3
− 3
View file @ 1024055f
......@@ -29,13 +29,13 @@ import io.quarkus.test.junit.QuarkusTestProfile;
public class KeycloakTestProfile implements QuarkusTestProfile {
private final String userKey = "kop.keycloak.api.user";
private final String userKey = "usermanager.keycloak.api.user";
private final String userValue = "userManagerApiUser";
private final String passwordKey = "kop.keycloak.api.password";
private final String passwordKey = "usermanager.keycloak.api.password";
private final String passwordValue = "hlc_j1I1Ji0trC0";
private final String realmKey = "kop.keycloak.api.realm";
private final String realmKey = "usermanager.keycloak.api.realm";
private final String realmValue = "by-kiel-dev";
private final String urlKey = "keycloak.url";
......
user-manager-server/src/test/resources/application.yml
+ 3
− 3
View file @ 1024055f
......@@ -3,7 +3,7 @@ quarkus:
devservices:
enabled: false
application:
name: kopusermanager
name: ozgcloud_usermanager
mongodb:
devservices:
enabled: false
......@@ -16,7 +16,7 @@ quarkus:
oidc:
auth-server-url: https://sso.dev.by.ozg-cloud.de/realms/by-kiel-dev
kop:
usermanager:
keycloak:
api:
user: "-"
......@@ -24,7 +24,7 @@ kop:
realm: by-kiel-dev
organisations-einheit-id-key: organisationseinheitId
ldap-id-key: LDAP_ID
client: sh-kiel-dev-goofy
client: alfa
user-manager:
url: http://localhost:9092
keycloak:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit