From c858c79a5821c4bf2e3ab6760c166274e70b8840 Mon Sep 17 00:00:00 2001 From: Sebastian Luna-Valero Date: Tue, 14 May 2024 07:39:12 +0200 Subject: [PATCH 1/2] fixes #656 --- .../en/users/security/secrets-store/architecture/_index.md | 2 +- content/en/users/security/secrets-store/cli/_index.md | 6 +++--- content/en/users/security/secrets-store/gui/_index.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/content/en/users/security/secrets-store/architecture/_index.md b/content/en/users/security/secrets-store/architecture/_index.md index 005de9e75b..f1f414eef0 100644 --- a/content/en/users/security/secrets-store/architecture/_index.md +++ b/content/en/users/security/secrets-store/architecture/_index.md @@ -47,7 +47,7 @@ node endpoints is not recommended: if a server is down, its endpoint is not accessible.{{% /alert %}} For convenience and high availability, you should use the -[generic endpoint](https://vault.services.fedcloud.eu:8200) to access the +[generic endpoint](https://secrets.egi.eu) to access the service. This generic endpoint will be pointed to one of the service nodes automatically via [Dynamic DNS](../../../compute/cloud-compute/dynamic-dns/). A simple cron script periodically checks and assigns the generic hostname to diff --git a/content/en/users/security/secrets-store/cli/_index.md b/content/en/users/security/secrets-store/cli/_index.md index 793b691a82..9d2fe751dd 100644 --- a/content/en/users/security/secrets-store/cli/_index.md +++ b/content/en/users/security/secrets-store/cli/_index.md @@ -524,7 +524,7 @@ need a Vault token. You can get one from your EGI Check-in access token. To get a Vault token: ```shell -$ export VAULT_ADDR=https://vault.services.fedcloud.eu:8200 +$ export VAULT_ADDR=https://secrets.egi.eu $ export VAULT_TOKEN=$(vault write auth/jwt/login jwt=$OIDC_ACCESS_TOKEN | grep -Po 'token\s+\K[^\s]+$') ``` @@ -534,7 +534,7 @@ $ export VAULT_TOKEN=$(vault write auth/jwt/login jwt=$OIDC_ACCESS_TOKEN | To get a Vault token: ```powershell -> $env:VAULT_ADDR="https://vault.services.fedcloud.eu:8200" +> $env:VAULT_ADDR="https://secrets.egi.eu" > $env:VAULT_TOKEN=$(vault write auth/jwt/login jwt=$env:OIDC_ACCESS_TOKEN ` | Select-String -Pattern "(?<=token\s+)[^\s]+(?=$)" ` | %{$_.Matches.value}) @@ -545,7 +545,7 @@ To get a Vault token: To get a Vault token: ```shell -> set VAULT_ADDR=https://vault.services.fedcloud.eu:8200 +> set VAULT_ADDR=https://secrets.egi.eu > for /f "delims=" %a in ('vault write auth/jwt/login "jwt=%OIDC_ACCESS_TOKEN%" ^| findstr /r /c:"token[ ][ ]*[^^ ]*"') do @set VAULT_TOKEN=%a:token=% > set VAULT_TOKEN=%VAULT_TOKEN: =% ``` diff --git a/content/en/users/security/secrets-store/gui/_index.md b/content/en/users/security/secrets-store/gui/_index.md index 227af81d03..7e5adaf3e1 100644 --- a/content/en/users/security/secrets-store/gui/_index.md +++ b/content/en/users/security/secrets-store/gui/_index.md @@ -21,7 +21,7 @@ are available on the Follow the steps below to access the web interface of EGI Secrets Store: -- Open https://vault.services.fedcloud.eu:8200 in your browser. +- Open https://secrets.egi.eu in your browser. - Choose the _OIDC authentication_ method in the pulldown menu, then click _Sign in with OIDC provider_. - Login via _EGI Check-in_ and authorize the Vault GUI. From 3eea6745dc3d6412457e51db684b221887e1e783 Mon Sep 17 00:00:00 2001 From: Sebastian Luna-Valero Date: Tue, 14 May 2024 08:23:56 +0200 Subject: [PATCH 2/2] spelling --- .github/actions/spelling/allow.txt | 3 +++ .github/actions/spelling/expect.txt | 6 ++++++ .github/actions/spelling/patterns.txt | 1 + content/en/users/security/secrets-store/cli/_index.md | 4 ++-- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt index 8ac9e2e298..4bd0d98ef2 100644 --- a/.github/actions/spelling/allow.txt +++ b/.github/actions/spelling/allow.txt @@ -337,6 +337,7 @@ jupyterhub JWKS kernel keycloak +keyfile keyout keypair keyring @@ -403,6 +404,7 @@ myproxy myrepo myreposgm myserver +mysql mysqldump mysqldumpmds myvo @@ -517,6 +519,7 @@ RDIG rdkit rdm reassignable +redis refeds refreshtoken reportgroups diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt index b426ce0f85..b728141c5b 100644 --- a/.github/actions/spelling/expect.txt +++ b/.github/actions/spelling/expect.txt @@ -1,11 +1,17 @@ allowfullscreen autoplay CVMFS +dearmor +delims diracsgm +findstr iframe jscpd +jwt +lsb markdownlint mytoken +pem prettierrc reponame sgm diff --git a/.github/actions/spelling/patterns.txt b/.github/actions/spelling/patterns.txt index 39dff5edaa..53d9783ed1 100644 --- a/.github/actions/spelling/patterns.txt +++ b/.github/actions/spelling/patterns.txt @@ -151,3 +151,4 @@ mailto:[-a-zA-Z=;:/?%&0-9+@.]{3,} \bmicrok8s\b \ba2enmod\b \beduGAIN\b +\b-field\b diff --git a/content/en/users/security/secrets-store/cli/_index.md b/content/en/users/security/secrets-store/cli/_index.md index 9d2fe751dd..5854a8947c 100644 --- a/content/en/users/security/secrets-store/cli/_index.md +++ b/content/en/users/security/secrets-store/cli/_index.md @@ -50,7 +50,7 @@ $ export OIDC_ACCESS_TOKEN= The [FedCloud client](../../../getting-started/cli) is integrated with the EGI Secrets Store service, so that users can access the service immediately with -simple commands. Below is a quickstart to using the service. +simple commands. Below is a quick start to using the service. ### Basic usage @@ -643,7 +643,7 @@ To create or update a secret: {{< /tabx >}}{{< /tabpanex >}} {{% alert title="Tip" color="info" %}} Use quotes if the key or value includes -whitespaces. You can include in the same quote both the key and the value. +white spaces. You can include in the same quote both the key and the value. {{% /alert %}} {{% alert title="Note" color="info" %}} You can add as many key to a secret as