Skip to content

Commit a3482df

Browse files
josecelanojosecelano
committed
Merge #556: Rename tracker env vars
f8f08ec refactor: [#555] rename tracker env vars (Jose Celano) Pull request description: Rename tracker env vars to follow changes in: torrust/torrust-tracker#851 ``` 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 ``` ACKs for top commit: josecelano: ACK f8f08ec Tree-SHA512: 03b9aa3f66b62ca72275a35395632b955cdb761cff982d46c5650e6c0a82fb54c595b6e94400b7f2e667b27da15cd6a4df96f1d9afabc8c73223bf7af806f27f
2 parents ca9ac7d + f8f08ec commit a3482df

File tree

9 files changed

+16
-28
lines changed

9 files changed

+16
-28
lines changed

‎.env.local‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ DATABASE_URL=sqlite://storage/database/data.db?mode=rwc
77
# Docker compose
88
TORRUST_INDEX_CONFIG=
99
USER_ID=1000
10-
TORRUST_TRACKER_CONFIG=
10+
TORRUST_TRACKER_CONFIG_TOML=
1111
TORRUST_TRACKER_USER_UID=1000
12-
TORRUST_TRACKER_API_TOKEN=MyAccessToken
12+
TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN=MyAccessToken

‎compose.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ services:
5353
tty: true
5454
environment:
5555
- USER_ID=${USER_ID}
56-
- TORRUST_TRACKER_CONFIG=${TORRUST_TRACKER_CONFIG}
56+
- TORRUST_TRACKER_CONFIG_TOML=${TORRUST_TRACKER_CONFIG_TOML}
5757
- TORRUST_TRACKER_DATABASE=${TORRUST_TRACKER_DATABASE:-e2e_testing_sqlite3}
58-
- TORRUST_TRACKER_DATABASE_DRIVER=${TORRUST_TRACKER_DATABASE_DRIVER:-sqlite3}
59-
- TORRUST_TRACKER_API_ADMIN_TOKEN=${TORRUST_TRACKER_API_ADMIN_TOKEN:-MyAccessToken}
58+
- TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER=${TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER:-Sqlite3}
59+
- TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN=${TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN:-MyAccessToken}
6060
networks:
6161
- server_side
6262
ports:

‎contrib/dev-tools/container/e2e/sqlite/e2e-env-down.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
USER_ID=${USER_ID:-1000} \
44
TORRUST_INDEX_CONFIG=$(cat ./share/default/config/index.e2e.container.sqlite3.toml) \
5-
TORRUST_TRACKER_CONFIG=$(cat ./share/default/config/tracker.e2e.container.sqlite3.toml) \
5+
TORRUST_TRACKER_CONFIG_TOML=$(cat ./share/default/config/tracker.e2e.container.sqlite3.toml) \
66
docker compose down

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
USER_ID=${USER_ID:-1000} \
44
TORRUST_INDEX_CONFIG=$(cat ./share/default/config/index.e2e.container.sqlite3.toml) \
5-
TORRUST_TRACKER_CONFIG=$(cat ./share/default/config/tracker.e2e.container.sqlite3.toml) \
5+
TORRUST_TRACKER_CONFIG_TOML=$(cat ./share/default/config/tracker.e2e.container.sqlite3.toml) \
66
docker compose build
77

88
USER_ID=${USER_ID:-1000} \
99
TORRUST_INDEX_CONFIG=$(cat ./share/default/config/index.e2e.container.sqlite3.toml) \
1010
TORRUST_INDEX_DATABASE="e2e_testing_sqlite3" \
1111
TORRUST_INDEX_DATABASE_DRIVER="sqlite3" \
1212
TORRUST_INDEX_TRACKER_API_TOKEN="MyAccessToken" \
13-
TORRUST_TRACKER_CONFIG=$(cat ./share/default/config/tracker.e2e.container.sqlite3.toml) \
13+
TORRUST_TRACKER_CONFIG_TOML=$(cat ./share/default/config/tracker.e2e.container.sqlite3.toml) \
1414
TORRUST_TRACKER_DATABASE="e2e_testing_sqlite3" \
15-
TORRUST_TRACKER_DATABASE_DRIVER="sqlite3" \
16-
TORRUST_TRACKER_API_ADMIN_TOKEN="MyAccessToken" \
15+
TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER="Sqlite3" \
16+
TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN="MyAccessToken" \
1717
docker compose up --detach --pull always --remove-orphans

‎docs/containerization_guide.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,18 +278,18 @@ mkdir -p ./storage/index-gui/log/
278278

279279
USER_ID=${USER_ID:-1000} \
280280
TORRUST_INDEX_CONFIG=$(cat ./share/default/config/index.e2e.container.sqlite3.toml) \
281-
TORRUST_TRACKER_CONFIG=$(cat ./share/default/config/tracker.e2e.container.sqlite3.toml) \
281+
TORRUST_TRACKER_CONFIG_TOML=$(cat ./share/default/config/tracker.e2e.container.sqlite3.toml) \
282282
docker compose build
283283

284284
USER_ID=${USER_ID:-1000} \
285285
TORRUST_INDEX_CONFIG=$(cat ./share/default/config/index.e2e.container.sqlite3.toml) \
286286
TORRUST_INDEX_DATABASE="e2e_testing_sqlite3" \
287287
TORRUST_INDEX_DATABASE_DRIVER="sqlite3" \
288288
TORRUST_INDEX_TRACKER_API_TOKEN="MyAccessToken" \
289-
TORRUST_TRACKER_CONFIG=$(cat ./share/default/config/tracker.e2e.container.sqlite3.toml) \
289+
TORRUST_TRACKER_CONFIG_TOML=$(cat ./share/default/config/tracker.e2e.container.sqlite3.toml) \
290290
TORRUST_TRACKER_DATABASE="e2e_testing_sqlite3" \
291-
TORRUST_TRACKER_DATABASE_DRIVER="sqlite3" \
292-
TORRUST_TRACKER_API_ADMIN_TOKEN="MyAccessToken" \
291+
TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER="Sqlite3" \
292+
TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN="MyAccessToken" \
293293
docker compose up --detach --pull always --remove-orphans
294294
```
295295

‎dot.env.local‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ DATABASE_URL=sqlite://storage/database/data.db?mode=rwc
77
# Docker compose
88
TORRUST_INDEX_CONFIG=
99
USER_ID=1000
10-
TORRUST_TRACKER_CONFIG=
11-
TORRUST_TRACKER_API_TOKEN=MyAccessToken
10+
TORRUST_TRACKER_CONFIG_TOML=
11+
TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN=MyAccessToken

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

Lines changed: 0 additions & 4 deletions
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‎

Lines changed: 0 additions & 4 deletions
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‎

Lines changed: 0 additions & 4 deletions
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

0 commit comments

Comments
 (0)