Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update all api config for keycloak standalone #258

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ public final class AppConfig {
public static final Integer CONTROLLER_HTTP_PORT = CONFIG.getInt("CONTROLLER_HTTP_PORT");
public static final String SESSION_SECRET = CONFIG.getString("JEMPI_SESSION_SECRET");
public static final Level GET_LOG_LEVEL = Level.toLevel(CONFIG.getString("LOG4J2_LEVEL"));
public static final String SYSTEM_CONFIG_DIR = CONFIG.getString("SYSTEM_CONFIG_DIR");
public static final String API_CONFIG_REFERENCE_FILENAME = CONFIG.getString("API_CONFIG_REFERENCE_FILENAME");
public static final String API_CONFIG_MASTER_FILENAME = CONFIG.getString("API_CONFIG_MASTER_FILENAME");
public static final String API_FIELDS_CONFIG_FILENAME = CONFIG.getString("API_FIELDS_CONFIG_FILENAME");

private AppConfig() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ public Behavior<Void> create() {
AppConfig.POSTGRESQL_AUDIT_DB,
AppConfig.KAFKA_BOOTSTRAP_SERVERS,
"CLIENT_ID_API_KC-" + UUID.randomUUID(),
null,
null,
null,
null),
AppConfig.SYSTEM_CONFIG_DIR,
AppConfig.API_CONFIG_REFERENCE_FILENAME,
AppConfig.API_CONFIG_MASTER_FILENAME,
AppConfig.API_FIELDS_CONFIG_FILENAME),
"BackEnd");
context.watch(backEnd);
final DispatcherSelector selector = DispatcherSelector.fromConfig("akka.actor.default-dispatcher");
Expand Down
7 changes: 6 additions & 1 deletion devops/linux/docker/conf/env/create-env-linux-low-1.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,14 @@ export JEMPI_SESSION_DOMAIN_NAME="localhost"
# NODE_ENV production || development
export NODE_ENV="production"
export REACT_APP_JEMPI_BASE_API_HOST=http://${NODE1_IP}

#enable use of keycloak
#export REACT_APP_JEMPI_BASE_API_PORT=50001
#export REACT_APP_ENABLE_SSO="true"
MatthewErispe marked this conversation as resolved.
Show resolved Hide resolved

export REACT_APP_JEMPI_BASE_API_PORT=50000
export REACT_APP_MOCK_BACKEND="false"
export REACT_APP_ENABLE_SSO="false"
export REACT_APP_MOCK_BACKEND="false"
export KC_FRONTEND_URL=http://${NODE1_IP}:8080

# ram limit for linker
Expand Down
3 changes: 3 additions & 0 deletions devops/linux/docker/conf/stack/docker-stack-high-0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -698,6 +698,9 @@ services:
LINKER_HTTP_PORT: ${LINKER_HTTP_PORT}
CONTROLLER_IP: controller
CONTROLLER_HTTP_PORT: ${CONTROLLER_HTTP_PORT}
SYSTEM_CONFIG_DIR: ${SYSTEM_CONFIG_DIR}
API_CONFIG_REFERENCE_FILENAME: ${API_CONFIG_REFERENCE_FILENAME}
API_CONFIG_MASTER_FILENAME: ${API_CONFIG_MASTER_FILENAME}
API_FIELDS_CONFIG_FILENAME: ${API_FIELDS_CONFIG_FILENAME}
networks:
- frontend
Expand Down
3 changes: 3 additions & 0 deletions devops/linux/docker/conf/stack/docker-stack-high-1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -698,6 +698,9 @@ services:
LINKER_HTTP_PORT: ${LINKER_HTTP_PORT}
CONTROLLER_IP: controller
CONTROLLER_HTTP_PORT: ${CONTROLLER_HTTP_PORT}
SYSTEM_CONFIG_DIR: ${SYSTEM_CONFIG_DIR}
API_CONFIG_REFERENCE_FILENAME: ${API_CONFIG_REFERENCE_FILENAME}
API_CONFIG_MASTER_FILENAME: ${API_CONFIG_MASTER_FILENAME}
API_FIELDS_CONFIG_FILENAME: ${API_FIELDS_CONFIG_FILENAME}
networks:
- frontend
Expand Down
3 changes: 3 additions & 0 deletions devops/linux/docker/conf/stack/docker-stack-low-0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,9 @@ services:
LINKER_HTTP_PORT: ${LINKER_HTTP_PORT}
CONTROLLER_IP: controller
CONTROLLER_HTTP_PORT: ${CONTROLLER_HTTP_PORT}
SYSTEM_CONFIG_DIR: ${SYSTEM_CONFIG_DIR}
API_CONFIG_REFERENCE_FILENAME: ${API_CONFIG_REFERENCE_FILENAME}
API_CONFIG_MASTER_FILENAME: ${API_CONFIG_MASTER_FILENAME}
API_FIELDS_CONFIG_FILENAME: ${API_FIELDS_CONFIG_FILENAME}
networks:
- frontend
Expand Down
3 changes: 3 additions & 0 deletions devops/linux/docker/conf/stack/docker-stack-low-1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,9 @@ services:
LINKER_HTTP_PORT: ${LINKER_HTTP_PORT}
CONTROLLER_IP: controller
CONTROLLER_HTTP_PORT: ${CONTROLLER_HTTP_PORT}
SYSTEM_CONFIG_DIR: ${SYSTEM_CONFIG_DIR}
API_CONFIG_REFERENCE_FILENAME: ${API_CONFIG_REFERENCE_FILENAME}
API_CONFIG_MASTER_FILENAME: ${API_CONFIG_MASTER_FILENAME}
API_FIELDS_CONFIG_FILENAME: ${API_FIELDS_CONFIG_FILENAME}
networks:
- frontend
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"accessLevel": []
},
{
"fieldName": "given_name",
"fieldName": "givenName",
"fieldType": "String",
"fieldLabel": "First Name",
"groups": [
Expand All @@ -45,7 +45,7 @@
"accessLevel": []
},
{
"fieldName": "family_name",
"fieldName": "familyName",
"fieldType": "String",
"fieldLabel": "Last Name",
"groups": [
Expand Down Expand Up @@ -147,7 +147,7 @@
}
},
{
"fieldName": "phone_number",
"fieldName": "phoneNumber",
"fieldType": "String",
"fieldLabel": "Phone No",
"groups": [
Expand All @@ -166,7 +166,7 @@
"accessLevel": []
},
{
"fieldName": "national_id",
"fieldName": "nationalId",
"fieldType": "String",
"fieldLabel": "National ID",
"groups": [
Expand Down