Skip to content

Commit 470bfb2

Browse files
committed
refactor: [#576] rename tracker env vars
``` TORRUST_TRACKER_BACK_ -> TORRUST_TRACKER_ TORRUST_TRACKER_DATABASE_DRIVER -> TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER TORRUST_TRACKER_API_ADMIN_TOKEN -> TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN TORRUST_TRACKER_CONFIG -> TORRUST_TRACKER_CONFIG_TOML TORRUST_TRACKER_PATH_CONFIG -> TORRUST_TRACKER_CONFIG_TOML_PATH ``` To follow changes in: torrust/torrust-tracker#851
1 parent ce7de0a commit 470bfb2

11 files changed

+16
-29
lines changed

.env.local

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ DATABASE_URL=sqlite://storage/database/data.db?mode=rwc
22
TORRUST_INDEX_CONFIG=
33
TORRUST_INDEX_AUTH_SECRET_KEY=MaxVerstappenWC2021
44
USER_ID=1000
5-
TORRUST_TRACKER_CONFIG=
6-
TORRUST_TRACKER_DATABASE_DRIVER=sqlite3
7-
TORRUST_TRACKER_API_ADMIN_TOKEN=MyAccessToken
5+
TORRUST_TRACKER_CONFIG_TOML=
6+
TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER=Sqlite3
7+
TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN=MyAccessToken

Containerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ RUN ["/busybox/cp", "-sp", "/busybox/sh","/busybox/cat","/busybox/ls","/busybox/
9898
COPY --from=gcc --chmod=0555 /usr/local/bin/su-exec /bin/su-exec
9999

100100
ARG TORRUST_INDEX_PATH_CONFIG="/etc/torrust/index/index.toml"
101-
ARG TORRUST_INDEX_DATABASE_DRIVER="sqlite3"
101+
ARG TORRUST_INDEX_DATABASE_DRIVER="Sqlite3"
102102
ARG USER_ID=1000
103103
ARG API_PORT=3001
104104
ARG IMPORTER_API_PORT=3002

compose.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ services:
3232
tty: true
3333
environment:
3434
- USER_ID=${USER_ID}
35-
- TORRUST_TRACKER_CONFIG=${TORRUST_TRACKER_CONFIG}
35+
- TORRUST_TRACKER_CONFIG_TOML=${TORRUST_TRACKER_CONFIG_TOML}
3636
- TORRUST_TRACKER_DATABASE=${TORRUST_TRACKER_DATABASE:-e2e_testing_sqlite3}
37-
- TORRUST_TRACKER_DATABASE_DRIVER=${TORRUST_TRACKER_DATABASE_DRIVER:-sqlite3}
38-
- TORRUST_TRACKER_API_ADMIN_TOKEN=${TORRUST_TRACKER_API_ADMIN_TOKEN:-MyAccessToken}
37+
- TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER=${TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER:-Sqlite3}
38+
- TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN=${TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN:-MyAccessToken}
3939
networks:
4040
- server_side
4141
ports:
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
22

33
TORRUST_INDEX_CONFIG=$(cat ./share/default/config/index.e2e.container.mysql.toml) \
4-
TORRUST_TRACKER_CONFIG=$(cat ./share/default/config/tracker.e2e.container.sqlite.toml) \
4+
TORRUST_TRACKER_CONFIG_TOML=$(cat ./share/default/config/tracker.e2e.container.sqlite.toml) \
55
docker compose down

contrib/dev-tools/container/e2e/mysql/e2e-env-up.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ USER_ID=${USER_ID:-1000} \
99
TORRUST_INDEX_DATABASE_DRIVER="mysql" \
1010
TORRUST_INDEX_TRACKER_API_TOKEN="MyAccessToken" \
1111
TORRUST_INDEX_MYSQL_DATABASE="torrust_index_e2e_testing" \
12-
TORRUST_TRACKER_CONFIG=$(cat ./share/default/config/tracker.e2e.container.sqlite3.toml) \
12+
TORRUST_TRACKER_CONFIG_TOML=$(cat ./share/default/config/tracker.e2e.container.sqlite3.toml) \
1313
TORRUST_TRACKER_DATABASE="e2e_testing_sqlite3" \
14-
TORRUST_TRACKER_DATABASE_DRIVER="sqlite3" \
15-
TORRUST_TRACKER_API_ADMIN_TOKEN="MyAccessToken" \
14+
TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER="Sqlite3" \
15+
TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN="MyAccessToken" \
1616
docker compose up --detach --pull always --remove-orphans
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
22

33
TORRUST_INDEX_CONFIG=$(cat ./share/default/config/index.e2e.container.sqlite3.toml) \
4-
TORRUST_TRACKER_CONFIG=$(cat ./share/default/config/tracker.e2e.container.sqlite3.toml) \
4+
TORRUST_TRACKER_CONFIG_TOML=$(cat ./share/default/config/tracker.e2e.container.sqlite3.toml) \
55
docker compose down

contrib/dev-tools/container/e2e/sqlite/e2e-env-up.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ USER_ID=${USER_ID:-1000} \
99
TORRUST_INDEX_DATABASE_DRIVER="sqlite3" \
1010
TORRUST_INDEX_TRACKER_API_TOKEN="MyAccessToken" \
1111
TORRUST_INDEX_AUTH_SECRET_KEY="MaxVerstappenWC2021" \
12-
TORRUST_TRACKER_CONFIG=$(cat ./share/default/config/tracker.e2e.container.sqlite3.toml) \
12+
TORRUST_TRACKER_CONFIG_TOML=$(cat ./share/default/config/tracker.e2e.container.sqlite3.toml) \
1313
TORRUST_TRACKER_DATABASE="e2e_testing_sqlite3" \
14-
TORRUST_TRACKER_DATABASE_DRIVER="sqlite3" \
15-
TORRUST_TRACKER_API_ADMIN_TOKEN="MyAccessToken" \
14+
TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER="Sqlite3" \
15+
TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN="MyAccessToken" \
1616
docker compose up --detach --pull always --remove-orphans

share/default/config/tracker.container.mysql.toml

-4
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ ssl_cert_path = "/var/lib/torrust/tracker/tls/localhost.crt"
3030
ssl_enabled = false
3131
ssl_key_path = "/var/lib/torrust/tracker/tls/localhost.key"
3232

33-
# Please override the admin token setting the
34-
# `TORRUST_TRACKER_API_ADMIN_TOKEN`
35-
# environmental variable!
36-
3733
[http_api.access_tokens]
3834
admin = "MyAccessToken"
3935

share/default/config/tracker.container.sqlite3.toml

-4
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ ssl_cert_path = "/var/lib/torrust/tracker/tls/localhost.crt"
3030
ssl_enabled = false
3131
ssl_key_path = "/var/lib/torrust/tracker/tls/localhost.key"
3232

33-
# Please override the admin token setting the
34-
# `TORRUST_TRACKER_API_ADMIN_TOKEN`
35-
# environmental variable!
36-
3733
[http_api.access_tokens]
3834
admin = "MyAccessToken"
3935

share/default/config/tracker.e2e.container.sqlite3.toml

-5
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,8 @@ ssl_cert_path = "/var/lib/torrust/tracker/tls/localhost.crt"
3030
ssl_enabled = false
3131
ssl_key_path = "/var/lib/torrust/tracker/tls/localhost.key"
3232

33-
# Please override the admin token setting the
34-
# `TORRUST_TRACKER_API_ADMIN_TOKEN`
35-
# environmental variable!
36-
3733
[http_api.access_tokens]
3834
admin = "MyAccessToken"
3935

4036
[health_check_api]
4137
bind_address = "127.0.0.1:1313"
42-

src/config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ impl Info {
8181
pub enum Error {
8282
/// Unable to load the configuration from the environment variable.
8383
/// This error only occurs if there is no configuration file and the
84-
/// `TORRUST_TRACKER_CONFIG` environment variable is not set.
84+
/// `TORRUST_TRACKER_CONFIG_TOML` environment variable is not set.
8585
#[error("Unable to load from Environmental Variable: {source}")]
8686
UnableToLoadFromEnvironmentVariable {
8787
source: LocatedError<'static, dyn std::error::Error + Send + Sync>,

0 commit comments

Comments
 (0)