Skip to content

Commit e713594

Browse files
committed
Sync documentation of main branch
1 parent 8b08626 commit e713594

File tree

7 files changed

+64
-30
lines changed

7 files changed

+64
-30
lines changed

_generated-doc/main/config/quarkus-all-config.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21957,7 +21957,7 @@ endif::add-copy-button-to-config-props[]
2195721957

2195821958
[.description]
2195921959
--
21960-
If the properties are stored in plain text. If this is false (the default) then it is expected that the passwords are of the form HEX( MD5( username ":" realm ":" password ) )
21960+
If the passwords are stored in the property file as plain text, e.g. `quarkus.security.users.embedded.users.alice=AlicesSecretPassword`. If this is false (the default) then it is expected that passwords are hashed as per the `algorithm` config property.
2196121961

2196221962

2196321963
ifdef::add-copy-button-to-env-var[]
@@ -21978,9 +21978,9 @@ endif::add-copy-button-to-config-props[]
2197821978

2197921979
[.description]
2198021980
--
21981-
Determine which algorithm to use.
21981+
The algorithm with which user password is hashed. The library expects a password prepended with the username and the realm, in the form ALG( username ":" realm ":" password ) in hexadecimal format.
2198221982

21983-
This property is ignored if `plainText` is true.
21983+
For example, on a Unix-like system we can produce the expected hash for Alice logging in to the Quarkus realm with password AlicesSecretPassword using `echo -n "alice:Quarkus:AlicesSecretPassword" ++\|++ sha512sum`, and thus set `quarkus.security.users.embedded.users.alice=c8131...4546` (full hash output abbreviated here). This property is ignored if `plainText` is true.
2198421984

2198521985

2198621986
ifdef::add-copy-button-to-env-var[]
@@ -21991,7 +21991,7 @@ Environment variable: `+++QUARKUS_SECURITY_USERS_EMBEDDED_ALGORITHM+++`
2199121991
endif::add-copy-button-to-env-var[]
2199221992
--
2199321993
a|`digest-md5`, `digest-sha`, `digest-sha-256`, `digest-sha-384`, `digest-sha-512`, `digest-sha-512-256`
21994-
|`+++digest-md5+++`
21994+
|`+++digest-sha-512+++`
2199521995

2199621996
a| [[quarkus-elytron-security-properties-file_quarkus-security-users-embedded-users-users]] [.property-path]##link:#quarkus-elytron-security-properties-file_quarkus-security-users-embedded-users-users[`quarkus.security.users.embedded.users."users"`]##
2199721997
ifdef::add-copy-button-to-config-props[]

_generated-doc/main/config/quarkus-elytron-security-properties-file.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ endif::add-copy-button-to-config-props[]
1515

1616
[.description]
1717
--
18-
If the properties are stored in plain text. If this is false (the default) then it is expected that the passwords are of the form HEX( MD5( username ":" realm ":" password ) )
18+
If the passwords are stored in the property file as plain text, e.g. `quarkus.security.users.embedded.users.alice=AlicesSecretPassword`. If this is false (the default) then it is expected that passwords are hashed as per the `algorithm` config property.
1919

2020

2121
ifdef::add-copy-button-to-env-var[]
@@ -36,9 +36,9 @@ endif::add-copy-button-to-config-props[]
3636

3737
[.description]
3838
--
39-
Determine which algorithm to use.
39+
The algorithm with which user password is hashed. The library expects a password prepended with the username and the realm, in the form ALG( username ":" realm ":" password ) in hexadecimal format.
4040

41-
This property is ignored if `plainText` is true.
41+
For example, on a Unix-like system we can produce the expected hash for Alice logging in to the Quarkus realm with password AlicesSecretPassword using `echo -n "alice:Quarkus:AlicesSecretPassword" ++\|++ sha512sum`, and thus set `quarkus.security.users.embedded.users.alice=c8131...4546` (full hash output abbreviated here). This property is ignored if `plainText` is true.
4242

4343

4444
ifdef::add-copy-button-to-env-var[]
@@ -49,7 +49,7 @@ Environment variable: `+++QUARKUS_SECURITY_USERS_EMBEDDED_ALGORITHM+++`
4949
endif::add-copy-button-to-env-var[]
5050
--
5151
a|`digest-md5`, `digest-sha`, `digest-sha-256`, `digest-sha-384`, `digest-sha-512`, `digest-sha-512-256`
52-
|`+++digest-md5+++`
52+
|`+++digest-sha-512+++`
5353

5454
a| [[quarkus-elytron-security-properties-file_quarkus-security-users-embedded-users-users]] [.property-path]##link:#quarkus-elytron-security-properties-file_quarkus-security-users-embedded-users-users[`quarkus.security.users.embedded.users."users"`]##
5555
ifdef::add-copy-button-to-config-props[]

_generated-doc/main/config/quarkus-elytron-security-properties-file_quarkus.security.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ endif::add-copy-button-to-config-props[]
1515

1616
[.description]
1717
--
18-
If the properties are stored in plain text. If this is false (the default) then it is expected that the passwords are of the form HEX( MD5( username ":" realm ":" password ) )
18+
If the passwords are stored in the property file as plain text, e.g. `quarkus.security.users.embedded.users.alice=AlicesSecretPassword`. If this is false (the default) then it is expected that passwords are hashed as per the `algorithm` config property.
1919

2020

2121
ifdef::add-copy-button-to-env-var[]
@@ -36,9 +36,9 @@ endif::add-copy-button-to-config-props[]
3636

3737
[.description]
3838
--
39-
Determine which algorithm to use.
39+
The algorithm with which user password is hashed. The library expects a password prepended with the username and the realm, in the form ALG( username ":" realm ":" password ) in hexadecimal format.
4040

41-
This property is ignored if `plainText` is true.
41+
For example, on a Unix-like system we can produce the expected hash for Alice logging in to the Quarkus realm with password AlicesSecretPassword using `echo -n "alice:Quarkus:AlicesSecretPassword" ++\|++ sha512sum`, and thus set `quarkus.security.users.embedded.users.alice=c8131...4546` (full hash output abbreviated here). This property is ignored if `plainText` is true.
4242

4343

4444
ifdef::add-copy-button-to-env-var[]
@@ -49,7 +49,7 @@ Environment variable: `+++QUARKUS_SECURITY_USERS_EMBEDDED_ALGORITHM+++`
4949
endif::add-copy-button-to-env-var[]
5050
--
5151
a|`digest-md5`, `digest-sha`, `digest-sha-256`, `digest-sha-384`, `digest-sha-512`, `digest-sha-512-256`
52-
|`+++digest-md5+++`
52+
|`+++digest-sha-512+++`
5353

5454
a| [[quarkus-elytron-security-properties-file_quarkus-security-users-embedded-users-users]] [.property-path]##link:#quarkus-elytron-security-properties-file_quarkus-security-users-embedded-users-users[`quarkus.security.users.embedded.users."users"`]##
5555
ifdef::add-copy-button-to-config-props[]

_generated-doc/main/infra/quarkus-maven-plugin-goals.adoc

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,8 +1284,7 @@ a| [[quarkus-maven-plugin-goal-dev-debug]] debug
12841284
[.description]
12851285
--
12861286
If this server should be started in debug mode. The default is to start in debug mode and listen on port 5005. Whether the JVM is suspended waiting for a debugger to be attached, depends on the value of suspend.
1287-
debug supports the following options:
1288-
1287+
debug supports the following options:
12891288
Value Effect
12901289
false The JVM is not started in debug mode
12911290
true The JVM is started in debug mode and will be listening on debugHost:debugPort
@@ -3134,8 +3133,7 @@ a| [[quarkus-maven-plugin-goal-remote-dev-debug]] debug
31343133
[.description]
31353134
--
31363135
If this server should be started in debug mode. The default is to start in debug mode and listen on port 5005. Whether the JVM is suspended waiting for a debugger to be attached, depends on the value of suspend.
3137-
debug supports the following options:
3138-
3136+
debug supports the following options:
31393137
Value Effect
31403138
false The JVM is not started in debug mode
31413139
true The JVM is started in debug mode and will be listening on debugHost:debugPort
@@ -3687,8 +3685,7 @@ a| [[quarkus-maven-plugin-goal-test-debug]] debug
36873685
[.description]
36883686
--
36893687
If this server should be started in debug mode. The default is to start in debug mode and listen on port 5005. Whether the JVM is suspended waiting for a debugger to be attached, depends on the value of suspend.
3690-
debug supports the following options:
3691-
3688+
debug supports the following options:
36923689
Value Effect
36933690
false The JVM is not started in debug mode
36943691
true The JVM is started in debug mode and will be listening on debugHost:debugPort

_versions/main/guides/_includes/devtools/build.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
.CLI
33
----
44
ifdef::build-additional-parameters[]
5-
quarkus build quarkus deploy openshift
5+
quarkus build
6+
quarkus deploy openshift
67
endif::[]
78
ifndef::build-additional-parameters[]
89
quarkus build

_versions/main/guides/compose-dev-services.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ This integration provides a seamless development experience while giving you ful
3535
To use Compose Dev Services, you need:
3636

3737
1. A working *local* container environment: https://docs.docker.com/get-started/get-docker/[Docker] or https://podman.io/docs/installation[Podman]
38-
39-
2. Compose tooling such as `docker-compose` or `podman-compose`
40-
(Note that `docker compose` and `podman compose` commands internally call these binaries) :
38+
2. The `docker` or `podman` CLI present in the `$PATH`
39+
3. Compose tooling such as `docker-compose` or `podman-compose`
40+
(Note that `docker compose` and `podman compose` commands internally call these binaries):
4141

4242
* For Docker: https://docs.docker.com/compose/install/[Installing Docker Compose]
4343
* For Podman: https://podman-desktop.io/docs/compose/setting-up-compose[Setting up Compose]

_versions/main/guides/extension-registry-user.adoc

Lines changed: 44 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -221,19 +221,55 @@ Applications using a registry client can be configured using environment variabl
221221

222222
`QUARKUS_REGISTRIES` environment variable can be used to specify which registries should be enabled as a comma-separated list of registry IDs.
223223
For example
224-
```
224+
----
225225
QUARKUS_REGISTRIES=registry.acme.org,registry.quarkus.io
226-
```
226+
----
227227
That alone will be enough to initialize a registry client to pull extension catalogs from two registries using their default configurations.
228228

229229
Certain registry options could be initialized with their specific environment variables. Each such option will have the following environment variable prefix:
230-
```
230+
----
231231
QUARKUS_REGISTRY_<UPPERCASED_AND_UNDERSCORED_REGISTRY_ID>_
232-
```
232+
----
233233
where `<UPPERCASED_AND_UNDERSCORED_REGISTRY_ID>` is a registry ID with each character converted to uppercase and a `.` replaced with `_`. For example, `REGISTRY_ACME_ORG`.
234234

235-
The following options can be configured with this approach:
235+
Below are examples of various options that can be configured following this approach.
236236

237-
- Repository URL, for example `QUARKUS_REGISTRY_REGISTRY_ACME_ORG_REPO_URL=https://internal.registry.acme.org/maven`
238-
- Update policy, for example `QUARKUS_REGISTRY_REGISTRY_ACME_ORG_UPDATE_POLICY=always`
239-
- Offering, for example `QUARKUS_REGISTRY_REGISTRY_ACME_ORG_OFFERING=acme-magic`
237+
===== Repository URL
238+
239+
`QUARKUS_REGISTRY_<UPPERCASED_AND_UNDERSCORED_REGISTRY_ID>_REPO_URL=<REPO_URL>`
240+
241+
Example:
242+
----
243+
QUARKUS_REGISTRY_REGISTRY_ACME_ORG_REPO_URL=https://internal.registry.acme.org/maven
244+
----
245+
246+
===== Update policy
247+
248+
`QUARKUS_REGISTRY_<UPPERCASED_AND_UNDERSCORED_REGISTRY_ID>_UPDATE_POLICY=<UPDATE_POLICY>`
249+
250+
Example:
251+
----
252+
QUARKUS_REGISTRY_REGISTRY_ACME_ORG_UPDATE_POLICY=always
253+
----
254+
255+
===== Offering
256+
257+
`QUARKUS_REGISTRY_<UPPERCASED_AND_UNDERSCORED_REGISTRY_ID>_OFFERING=<OFFERING>`
258+
259+
Example:
260+
----
261+
QUARKUS_REGISTRY_REGISTRY_ACME_ORG_OFFERING=acme-magic
262+
----
263+
264+
===== Recommend Streams From
265+
266+
Set the oldest acceptable stream value per platform. Streams older than the configured values will be ignored by the client.
267+
268+
`QUARKUS_REGISTRY_<UPPERCASED_AND_UNDERSCORED_REGISTRY_ID>_RECOMMEND_STREAMS_FROM_<UPPERCASED_AND_UNDERSCORED_PLATFORM_KEY>=<STREAM_ID>`
269+
270+
Where `UPPERCASED_AND_UNDERSCORED_PLATFORM_KEY` is a platform key with each character converted to uppercase and a `.` replaced with `_`. For example, `IO_QUARKUS_PLATFORM`.
271+
272+
Example:
273+
----
274+
QUARKUS_REGISTRY_REGISTRY_ACME_ORG_RECOMMEND_STREAMS_FROM_IO_QUARKUS_PLATFORM=3.27
275+
----

0 commit comments

Comments
 (0)