diff --git a/kernel/kernel-config-server/README.md b/kernel/kernel-config-server/README.md index f2ff0838f0a..2b758f84684 100644 --- a/kernel/kernel-config-server/README.md +++ b/kernel/kernel-config-server/README.md @@ -10,6 +10,15 @@ server.servlet.path=/config ``` +**Support for multiple config repositories**
+This config server supports multiple repositories to provide configuration.
+How to configure: +1. Set env variable `SPRING_CONFIG_GIT_URIS` +2. The value of this env variable is JSON as string +3. SPRING_CONFIG_GIT_URIS="[{\"uri\": \"", \"branch\": \"\"}, {\"uri\": \"", \"branch\": \"\"}]" +4. If any property exists in multiple repositories then first repo in the list will have high priority and value will be referred from first repo. + + **For Encryption Decryption of properties**

Create keystore with following command:
@@ -30,7 +39,7 @@ Now run the jar using the following command:
`java -jar -Dspring.cloud.config.server.git.uri=< git-repo-ssh-url > -Dspring.cloud.config.server.git.search-paths=< config-folder-location-in-git-repo > -Dencrypt.keyStore.location=file:///< file-location-of-keystore > -Dencrypt.keyStore.password=< keystore-passowrd > -Dencrypt.keyStore.alias=< keystore-alias > -Dencrypt.keyStore.secret=< keystore-secret > < jar-name >`

-To run it inside Docker container provide the follwing run time arguments: +To run it inside Docker container provide the following run time arguments: 1. git_url_env The URL of your Git repo diff --git a/kernel/kernel-config-server/src/main/java/io/mosip/kernel/config/server/CompositeEnvironmentConfig.java b/kernel/kernel-config-server/src/main/java/io/mosip/kernel/config/server/CompositeEnvironmentConfig.java index a62b039a9e0..e9bff6df7b1 100644 --- a/kernel/kernel-config-server/src/main/java/io/mosip/kernel/config/server/CompositeEnvironmentConfig.java +++ b/kernel/kernel-config-server/src/main/java/io/mosip/kernel/config/server/CompositeEnvironmentConfig.java @@ -20,8 +20,8 @@ @Configuration public class CompositeEnvironmentConfig { - @Value("${my.git.uris}") - private String gitUris; + @Value("${spring.cloud.config.server.git.uri}") + private String cloudConfigGitUris; @Autowired private ConfigurableEnvironment configurableEnvironment; @@ -35,7 +35,7 @@ public class CompositeEnvironmentConfig { @Bean public CompositeEnvironmentRepository compositeEnvironmentRepository() throws JsonProcessingException { List repositories = new ArrayList<>(); - GitUri[] configGitUris = objectMapper.readValue(gitUris, GitUri[].class); + GitUri[] configGitUris = objectMapper.readValue(cloudConfigGitUris, GitUri[].class); for (GitUri gitUri: configGitUris) { JGitEnvironmentRepository repository = getjGitEnvironmentRepository(gitUri); diff --git a/kernel/kernel-config-server/src/main/resources/application.yml b/kernel/kernel-config-server/src/main/resources/application.yml index 3ba66cfd40e..a6ad5bd89a0 100644 --- a/kernel/kernel-config-server/src/main/resources/application.yml +++ b/kernel/kernel-config-server/src/main/resources/application.yml @@ -7,17 +7,15 @@ spring: config: server: accept-empty: "false" - + git: + uri: ${SPRING_CONFIG_GIT_URIS} + server: port: 51000 servlet: path: /config context-path: ${server.servlet.path} -my: - git: - uris: ${SPRING_CONFIG_GIT_URIS} - health: config: enabled: false