Skip to content

Commit 5fbd7ac

Browse files
committed
fix: [#6] update index configuration
To follow breaking changes in the Index config TOML files and env var names.
1 parent 1485c4f commit 5fbd7ac

File tree

7 files changed

+24
-22
lines changed

7 files changed

+24
-22
lines changed

.gitleaks.toml

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,17 @@ useDefault = true
77
[allowlist]
88
paths = [
99
'''.automation/test''',
10-
'''megalinter-reports''',
1110
'''.github/linters''',
12-
'''node_modules''',
1311
'''.mypy_cache''',
14-
'''(.*?)gitleaks\.toml$''',
1512
'''(.*?)(png|jpg|gif|doc|docx|pdf|bin|xls|pyc|zip)$''',
13+
'''(.*?)gitleaks\.toml$''',
1614
'''(go.mod|go.sum)$''',
1715
'''demo/config-idx-back.local.toml''',
1816
'''demo/config-index.local.toml''',
1917
'''demo/config-tracker.local.toml''',
18+
'''demo/dot.env.local''',
2019
'''droplet/share/container/default/config/index.prod.container.sqlite3.toml''',
20+
'''megalinter-reports''',
21+
'''node_modules''',
2122
]
2223
description = "Allowlisted files"

demo/compose.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ services:
2929
- TORRUST_INDEX_DATABASE=${TORRUST_INDEX_DATABASE:-e2e_testing_sqlite3}
3030
- TORRUST_INDEX_DATABASE_DRIVER=${TORRUST_INDEX_DATABASE_DRIVER:-sqlite3}
3131
- TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN=${TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN:-MyAccessToken}
32+
- TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__SECRET_KEY=${TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__SECRET_KEY:-MaxVerstappenWC2021}
3233
- TORRUST_INDEX_API_CORS_PERMISSIVE=${TORRUST_INDEX_API_CORS_PERMISSIVE:-true}
3334
- CARGO_HOME=/home/appuser/.cargo
3435
networks:

demo/dot.env.local

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1-
# App build variables
1+
## App build variables
22
API_BASE_URL=http://localhost:3001/v1
33

4-
# Rust SQLx
4+
## Rust SQLx
55
DATABASE_URL=sqlite://storage/database/data.db?mode=rwc
66

7-
# Docker compose
7+
## Docker compose
88
USER_ID=1000
9+
10+
### Index
911
TORRUST_INDEX_CONFIG_TOML=
10-
TORRUST_INDEX_USER_UID=1000
12+
TORRUST_INDEX_API_CORS_PERMISSIVE=true
13+
TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__SECRET_KEY='MaxVerstappenWC2021'
14+
TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN='MyAccessToken'
15+
16+
### Tracker
1117
TORRUST_TRACKER_CONFIG_TOML=
12-
TORRUST_TRACKER_USER_UID=1000
1318
TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN=MyAccessToken

droplet/.env.production

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ USER_ID=1000
22

33
# Index GUI
44
TORRUST_INDEX_GUI_API_BASE_URL='https://index.torrust-demo.com/api/v1'
5-
NITRO_HOST="0.0.0.0"
5+
NITRO_HOST=0.0.0.0
66
NITRO_PORT=3000
77

88
# Index
99
TORRUST_INDEX_CONFIG_TOML=
10-
TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN='MyAccessToken'
11-
TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__SECRET_KEY='MyAccessToken'
1210
TORRUST_INDEX_API_CORS_PERMISSIVE=false
11+
TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__SECRET_KEY='MaxVerstappenWC2021'
12+
TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN='MyAccessToken'
1313

1414
# Tracker
1515
TORRUST_TRACKER_CONFIG_TOML=

droplet/compose.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ services:
7474
- TORRUST_INDEX_DATABASE=${TORRUST_INDEX_DATABASE:-sqlite3}
7575
- TORRUST_INDEX_DATABASE_DRIVER=${TORRUST_INDEX_DATABASE_DRIVER:-sqlite3}
7676
- TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN=${TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN:-MyAccessToken}
77+
- TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__SECRET_KEY=${TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__SECRET_KEY:-MaxVerstappenWC2021}
7778
- TORRUST_INDEX_API_CORS_PERMISSIVE=${TORRUST_INDEX_API_CORS_PERMISSIVE:-true}
7879
networks:
7980
- backend_network
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
1-
# Please override the tracker token:
2-
# `TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN`
3-
# And the auth screte key:
4-
# `TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__SECRET_KEY`
5-
# environmental variables!
6-
71
[tracker]
8-
url = "udp://tracker.torrust-demo.com:6969"
92
api_url = "http://tracker:1212"
3+
url = "udp://tracker.torrust-demo.com:6969"
104

115
[database]
126
connect_url = "sqlite:///var/lib/torrust/index/database/sqlite3.db?mode=rwc"
137

14-
[mail]
15-
server = "mailcatcher"
8+
[mail.smtp]
169
port = 1025
10+
server = "mailcatcher"

project-words.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ stefanzweifel
1515
torrust
1616
Torrust
1717
TORRUST
18-
TORRUST
19-
webroot
18+
Verstappen
19+
webroot

0 commit comments

Comments
 (0)