Skip to content

Commit c407b76

Browse files
committed
config: do not enforce port 3000 in prod
1 parent fcd3419 commit c407b76

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

tools/env-generator/README.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ cp .env.template .env.base
1313
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:
1414
```export RUCIO_WEBUI_<VARIABLE_NAME>=<VARIABLE_VALUE>```
1515

16-
| Variable Name | Full Name | Description | Example | Default |
17-
|-----------------|-----------------------------|-------------------------------------------------------------------------------------|--------------------------------|---------|
18-
| RUCIO_HOST | RUCIO_WEBUI_RUCIO_HOST | URL for the Rucio Server | https://rucio-lb-prod.cern.ch | |
19-
| RUCIO_AUTH_HOST | RUCIO_WEBUI_RUCIO_AUTH_HOST | URL for the Rucio authentication server | https://rucio-auth-host.ch:443 | |
20-
| HOSTNAME | RUCIO_WEBUI_HOSTNAME | Public HOSTNAME at which Rucio WebUI will be accessible. DO NOT INCLUDE PORT NUMBER | rucio-ui.cern.ch | |
21-
| ENABLE_SSL | RUCIO_WEBUI_ENABLE_SSL | Enable or Disable TLS Termination (true or false) | true | false |
22-
| PROJECT_URL | RUCIO_WEBUI_PROJECT_URL | Public URL for your project | https://atlas.cern.ch | |
23-
| VO_DEFAULT | RUCIO_WEBUI_VO_DEFAULT | Short name for the default VO used for authentication | def | def |
24-
| VO_LIST | RUCIO_WEBUI_VO_LIST | CSV string containing the list of supported VOs | def, atl, cms | def |
25-
| MULTIVO_ENABLED | RUCIO_WEBUI_MULTIVO_ENABLED | Whether to enable multi-VO config (true or false) | true | |
26-
| OIDC_ENABLED | RUCIO_WEBUI_OIDC_ENABLED | Enable or Disable OIDC Authentication (true or false) | true | |
27-
| OIDC_PROVIDERS | RUCIO_WEBUI_OIDC_PROVIDERS | CSV string containing names of OIDC Providers | cern, indigo | |
16+
| Variable Name | Full Name | Description | Example | Default |
17+
|-----------------|-----------------------------|--------------------------------------------------------------------------------------|--------------------------------|---------|
18+
| RUCIO_HOST | RUCIO_WEBUI_RUCIO_HOST | URL for the Rucio Server | https://rucio-lb-prod.cern.ch | |
19+
| RUCIO_AUTH_HOST | RUCIO_WEBUI_RUCIO_AUTH_HOST | URL for the Rucio authentication server | https://rucio-auth-host.ch:443 | |
20+
| HOSTNAME | RUCIO_WEBUI_HOSTNAME | Public HOSTNAME at which Rucio WebUI will be accessible. It may include port number. | rucio-ui.cern.ch | |
21+
| ENABLE_SSL | RUCIO_WEBUI_ENABLE_SSL | Enable or Disable TLS Termination (true or false) | true | false |
22+
| PROJECT_URL | RUCIO_WEBUI_PROJECT_URL | Public URL for your project | https://atlas.cern.ch | |
23+
| VO_DEFAULT | RUCIO_WEBUI_VO_DEFAULT | Short name for the default VO used for authentication | def | def |
24+
| VO_LIST | RUCIO_WEBUI_VO_LIST | CSV string containing the list of supported VOs | def, atl, cms | def |
25+
| MULTIVO_ENABLED | RUCIO_WEBUI_MULTIVO_ENABLED | Whether to enable multi-VO config (true or false) | true | |
26+
| OIDC_ENABLED | RUCIO_WEBUI_OIDC_ENABLED | Enable or Disable OIDC Authentication (true or false) | true | |
27+
| OIDC_PROVIDERS | RUCIO_WEBUI_OIDC_PROVIDERS | CSV string containing names of OIDC Providers | cern, indigo | |
2828

2929
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:
3030
```export RUCIO_WEBUI_VO_<VO_SHORT_NAME>_<VARIABLE_NAME>=<VARIABLE_VALUE>```. An example for the default VO is shown below:

tools/env-generator/src/templates/.env.liquid

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[public]
22
{% if context['ENABLE_SSL'] == 'true' %}
3-
NEXT_PUBLIC_WEBUI_HOST=https://{{ context["HOSTNAME"] }}:3000
3+
NEXT_PUBLIC_WEBUI_HOST=https://{{ context["HOSTNAME"] }}
44
{% else %}
5-
NEXT_PUBLIC_WEBUI_HOST=http://{{ context["HOSTNAME"] }}:3000
5+
NEXT_PUBLIC_WEBUI_HOST=http://{{ context["HOSTNAME"] }}
66
{% endif %}
77
PROJECT_URL={{ context.PROJECT_URL }}
88

0 commit comments

Comments
 (0)