From fcd3419866e25eb396a99c832eccfb197e1e8bda Mon Sep 17 00:00:00 2001 From: maany Date: Thu, 22 Feb 2024 19:08:10 +0100 Subject: [PATCH] env: remote port requirement --- tools/env-generator/README.md | 24 +++++++++---------- tools/env-generator/src/templates/.env.liquid | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/env-generator/README.md b/tools/env-generator/README.md index 309338d46..03206e48e 100644 --- a/tools/env-generator/README.md +++ b/tools/env-generator/README.md @@ -13,18 +13,18 @@ cp .env.template .env.base 2. Edit the `.env.base` file and add the required environment variables. All the variables **MUST** be prefixed with `RUCIO_WEBUI_`` The variables should be added in the following format: ```export RUCIO_WEBUI_=``` -| Variable Name | Full Name | Description | Example | Default | -|-----------------|-----------------------------|-----------------------------------------------------------------------------------------|--------------------------------|---------| -| RUCIO_HOST | RUCIO_WEBUI_RUCIO_HOST | URL for the Rucio Server | https://rucio-lb-prod.cern.ch | | -| RUCIO_AUTH_HOST | RUCIO_WEBUI_RUCIO_AUTH_HOST | URL for the Rucio authentication server | https://rucio-auth-host.ch:443 | | -| HOSTNAME | RUCIO_WEBUI_HOSTNAME | Public HOSTNAME at which Rucio WebUI will be accessible. It can include the port number | rucio-ui.cern.ch | | -| ENABLE_SSL | RUCIO_WEBUI_ENABLE_SSL | Enable or Disable TLS Termination (true or false) | true | false | -| PROJECT_URL | RUCIO_WEBUI_PROJECT_URL | Public URL for your project | https://atlas.cern.ch | | -| VO_DEFAULT | RUCIO_WEBUI_VO_DEFAULT | Short name for the default VO used for authentication | def | def | -| VO_LIST | RUCIO_WEBUI_VO_LIST | CSV string containing the list of supported VOs | def, atl, cms | def | -| MULTIVO_ENABLED | RUCIO_WEBUI_MULTIVO_ENABLED | Whether to enable multi-VO config (true or false) | true | | -| OIDC_ENABLED | RUCIO_WEBUI_OIDC_ENABLED | Enable or Disable OIDC Authentication (true or false) | true | | -| OIDC_PROVIDERS | RUCIO_WEBUI_OIDC_PROVIDERS | CSV string containing names of OIDC Providers | cern, indigo | | +| Variable Name | Full Name | Description | Example | Default | +|-----------------|-----------------------------|-------------------------------------------------------------------------------------|--------------------------------|---------| +| RUCIO_HOST | RUCIO_WEBUI_RUCIO_HOST | URL for the Rucio Server | https://rucio-lb-prod.cern.ch | | +| RUCIO_AUTH_HOST | RUCIO_WEBUI_RUCIO_AUTH_HOST | URL for the Rucio authentication server | https://rucio-auth-host.ch:443 | | +| HOSTNAME | RUCIO_WEBUI_HOSTNAME | Public HOSTNAME at which Rucio WebUI will be accessible. DO NOT INCLUDE PORT NUMBER | rucio-ui.cern.ch | | +| ENABLE_SSL | RUCIO_WEBUI_ENABLE_SSL | Enable or Disable TLS Termination (true or false) | true | false | +| PROJECT_URL | RUCIO_WEBUI_PROJECT_URL | Public URL for your project | https://atlas.cern.ch | | +| VO_DEFAULT | RUCIO_WEBUI_VO_DEFAULT | Short name for the default VO used for authentication | def | def | +| VO_LIST | RUCIO_WEBUI_VO_LIST | CSV string containing the list of supported VOs | def, atl, cms | def | +| MULTIVO_ENABLED | RUCIO_WEBUI_MULTIVO_ENABLED | Whether to enable multi-VO config (true or false) | true | | +| OIDC_ENABLED | RUCIO_WEBUI_OIDC_ENABLED | Enable or Disable OIDC Authentication (true or false) | true | | +| OIDC_PROVIDERS | RUCIO_WEBUI_OIDC_PROVIDERS | CSV string containing names of OIDC Providers | cern, indigo | | For each `VO` specified in the `VO_LIST` variable, the additional variables need to be specified. The variables should be added in the following format: ```export RUCIO_WEBUI_VO__=```. An example for the default VO is shown below: diff --git a/tools/env-generator/src/templates/.env.liquid b/tools/env-generator/src/templates/.env.liquid index df26a880d..8e712f9ca 100644 --- a/tools/env-generator/src/templates/.env.liquid +++ b/tools/env-generator/src/templates/.env.liquid @@ -1,8 +1,8 @@ [public] {% if context['ENABLE_SSL'] == 'true' %} -NEXT_PUBLIC_WEBUI_HOST=https://{{ context["HOSTNAME"] }} +NEXT_PUBLIC_WEBUI_HOST=https://{{ context["HOSTNAME"] }}:3000 {% else %} -NEXT_PUBLIC_WEBUI_HOST=http://{{ context["HOSTNAME"] }} +NEXT_PUBLIC_WEBUI_HOST=http://{{ context["HOSTNAME"] }}:3000 {% endif %} PROJECT_URL={{ context.PROJECT_URL }}