From a3216a0ceaba0d78fd6b2c26f9caf4a243a0387b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20A=CC=81lvaro?= Date: Fri, 15 Mar 2024 08:29:43 +0100 Subject: [PATCH] fix(test): Export SALT_MINION_ID --- README.md | 4 ++-- assets/runtime/env-defaults.sh | 2 +- docs/es-ES/README.md | 4 ++-- tests/salt-minion/test.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index c5fb3ce..04c2ed0 100644 --- a/README.md +++ b/README.md @@ -393,7 +393,7 @@ This minion can be configured in the same way as the master. You can add your custom configuration files inside a `minion_config/` directory and mount it into `/home/salt/data/minion_config/`. -The default id of the minion is `builtin_minion`. +The default id of the minion is `builtin.minion`. But you can change it by setting the environment variable `SALT_MINION_ID`. Log levels are the same as the master, @@ -778,7 +778,7 @@ installation. | `SALT_API_USER_PASS` | `SALT_API_USER` password. Required if `SALT_API_SERVICE_ENBALED` is `True`, `SALT_API_USER` is not empty and `SALT_API_USER_PASS_FILE` is unset. _Unset_ by default. | | `SALT_API_CERT_CN` | Common name in the request. Default: `localhost`. | | `SALT_MINION_ENABLED` | Enable `salt-minion` service. Default: `False`. | -| `SALT_MINION_ID` | Set the id of the `salt-minion` service. Default: `builtin_minion`. | +| `SALT_MINION_ID` | Set the id of the `salt-minion` service. Default: `builtin.minion`. | | [`SALT_MASTER_SIGN_PUBKEY`](https://docs.saltproject.io/en/latest/ref/configuration/master.html#master-sign-pubkey) | Sign the master auth-replies with a cryptographic signature of the master's public key. Possible values: `True` or `False`. Default: `False`. | | [`SALT_MASTER_USE_PUBKEY_SIGNATURE`](https://docs.saltproject.io/en/latest/ref/configuration/master.html#master-use-pubkey-signature) | Instead of computing the signature for each auth-reply, use a pre-calculated signature. This option requires `SALT_MASTER_SIGN_PUBKEY` set to `True`. Possible values: `True` or `False`. Default: `True`. | | [`SALT_MASTER_SIGN_KEY_NAME`](https://docs.saltproject.io/en/latest/ref/configuration/master.html#master-sign-key-name) | The customizable name of the signing-key-pair without suffix. Default: `master_sign`. | diff --git a/assets/runtime/env-defaults.sh b/assets/runtime/env-defaults.sh index 7ff136e..5273812 100755 --- a/assets/runtime/env-defaults.sh +++ b/assets/runtime/env-defaults.sh @@ -13,7 +13,7 @@ SALT_API_CERT_CN=${SALT_API_CERT_CN:-localhost} ##### Salt Minion ##### SALT_MINION_ENABLED=${SALT_MINION_ENABLED:-False} -SALT_MINION_ID=${SALT_MINION_ID:-builtin_minion} +SALT_MINION_ID=${SALT_MINION_ID:-builtin.minion} SALT_MINION_CONFS_DIR="${SALT_DATA_DIR}/minion_config" SALT_MINION_KEYS_DIR="${SALT_KEYS_DIR}/${SALT_MINION_ID}" diff --git a/docs/es-ES/README.md b/docs/es-ES/README.md index 7a536f6..d29a519 100644 --- a/docs/es-ES/README.md +++ b/docs/es-ES/README.md @@ -366,7 +366,7 @@ Este minion puede configurarse de la misma manera que el master. Puedes añadir tus archivos de configuración personalizados dentro de un directorio `minion_config/` y montarlo en `/home/salt/data/minion_config/`. -El id por defecto del minion es `builtin_minion`. +El id por defecto del minion es `builtin.minion`. Pero puedes cambiarlo estableciendo la variable de entorno `SALT_MINION_ID`. El nivel de los logs del minion es el mismo que el del master, @@ -718,7 +718,7 @@ A continuación puedes encontrar una lista con las opciones disponibles que pued | `SALT_API_USER_PASS` | Contraseña del usuario `SALT_API_USER`. Requerida si `SALT_API_SERVICE_ENBALED` es `True`, `SALT_API_USER` no está vacía y no se ha definido `SALT_API_USER_PASS_FILE`. Por defecto: _No establecida_. | | `SALT_API_CERT_CN` | _Common name_ en el certificado de `salt-api`. Por defecto: `localhost`. | | `SALT_MINION_ENABLED` | Habilita el servicio `salt-minion`. Por defecto: `False`. | -| `SALT_MINION_ID` | El id del minion. Por defecto: `builtin_minion`. | +| `SALT_MINION_ID` | El id del minion. Por defecto: `builtin.minion`. | | [`SALT_MASTER_SIGN_PUBKEY`](https://docs.saltproject.io/en/latest/ref/configuration/master.html#master-sign-pubkey) | Firma las respuestas de `salt-master` con una firma criptográfica usando la clave pública del master. Valores permitidos: `True` o `False`. Por defecto: `False`. | | [`SALT_MASTER_USE_PUBKEY_SIGNATURE`](https://docs.saltproject.io/en/latest/ref/configuration/master.html#master-use-pubkey-signature) | En lugar de calcular la firma para cada respuesta, usa una firma pre-calculada. Esta opción requiere que `SALT_MASTER_SIGN_PUBKEY` sea `True`. Valores posibles: `True` or `False`. Por defecto: `True`. | | [`SALT_MASTER_SIGN_KEY_NAME`](https://docs.saltproject.io/en/latest/ref/configuration/master.html#master-sign-key-name) | El nombre del par de claves de firma sin sufijo. Por defecto: `master_sign`. | diff --git a/tests/salt-minion/test.sh b/tests/salt-minion/test.sh index b81eba2..c178779 100755 --- a/tests/salt-minion/test.sh +++ b/tests/salt-minion/test.sh @@ -12,7 +12,7 @@ COMMON_FILE="${SCRIPT_PATH}/../lib/common.sh" source "${COMMON_FILE}" trap cleanup EXIT -SALT_MINION_ID=test_minion +export SALT_MINION_ID=test.builtin.minion KEYS_DIR="${SCRIPT_PATH}/keys" # Run test instance