SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.1.x' into 4.2.x

Browse Source
This commit is contained in:
Ryan Baxter
2025-06-13 10:56:41 -04:00
parent 27a505bbce ca6c524433
commit db3feab9c9
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/modules/ROOT/pages/server/creating-a-key-store-for-testing.adoc
View File

@@ -11,9 +11,8 @@ $ keytool -genkeypair -alias mytestkey -keyalg RSA \
NOTE: When using JDK 11 or above you may get the following warning when using the command above. In this case
you probably want to make sure the `keypass` and `storepass` values match.
----
Warning: Different store and key passwords not supported for PKCS12 KeyStores. Ignoring user-specified -keypass value.
----
WARNING: Different store and key passwords not supported for PKCS12 KeyStores. Ignoring user-specified -keypass value.
Put the `server.jks` file in the classpath (for instance) and then, in
your `bootstrap.yml`, for the Config Server, create the following settings:

7
docs/modules/ROOT/pages/server/environment-repository/git-backend.adoc
View File

@@ -64,7 +64,7 @@ spring:
You can also support a "`one repository per profile`" policy by using a similar pattern but with
`\{profile}`.
Additionally, using the special string "(\{special-string})" within your `\{application}` parameters can enable support for multiple
Additionally, using the special string `(\{special-string})` within your `\{application}` parameters can enable support for multiple
organizations, as shown in the following example:
[source,yaml]
@@ -223,10 +223,13 @@ JGit requires RSA keys in PEM format. Below is an example ssh-keygen (from opens
ssh-keygen -m PEM -t rsa -b 4096 -f ~/config_server_deploy_key.rsa
```
Warning: When working with SSH keys, the expected ssh private-key must begin with ```-----BEGIN RSA PRIVATE KEY-----```. If the key starts with ```-----BEGIN OPENSSH PRIVATE KEY-----``` then the RSA key will not load when spring-cloud-config server is started. The error looks like:
[WARNING]
=====
When working with SSH keys, the expected ssh private-key must begin with ```-----BEGIN RSA PRIVATE KEY-----```. If the key starts with ```-----BEGIN OPENSSH PRIVATE KEY-----``` then the RSA key will not load when spring-cloud-config server is started. The error looks like:
```
- Error in object 'spring.cloud.config.server.git': codes [PrivateKeyIsValid.spring.cloud.config.server.git,PrivateKeyIsValid]; arguments [org.springframework.context.support.DefaultMessageSourceResolvable: codes [spring.cloud.config.server.git.,]; arguments []; default message []]; default message [Property 'spring.cloud.config.server.git.privateKey' is not a valid private key]
```
=====
To correct the above error the RSA key must be converted to PEM format. An example using openssh is provided above for generating a new key in the appropriate format.