Merge #29: Update tracker and index config

4701c58 fix: [#28] update tracker and index config (Jose Celano) Pull request description: Update tracker and index config. ACKs for top commit: josecelano: ACK 4701c58 Tree-SHA512: 282f6c6c6e9402d0eecfa4cf39f2c08fe112934764e1beef2907882179206d9ca79b8129378952bd319c45cecefb73ed2f8c747c38d225fe7775a7006f8b60ea
torrust · Aug 5, 2024 · c461a1c · c461a1c
2 parents 3c7a084 + 4701c58
commit c461a1c
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 10 deletions.
diff --git a/demo/compose.yaml b/demo/compose.yaml
@@ -29,7 +29,7 @@ services:
  - TORRUST_INDEX_DATABASE=${TORRUST_INDEX_DATABASE:-e2e_testing_sqlite3}
  - TORRUST_INDEX_DATABASE_DRIVER=${TORRUST_INDEX_DATABASE_DRIVER:-sqlite3}
  - TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN=${TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN:-MyAccessToken}
- - TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__SECRET_KEY=${TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__SECRET_KEY:-MaxVerstappenWC2021}
+ - TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__USER_CLAIM_TOKEN_PEPPER=${TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__USER_CLAIM_TOKEN_PEPPER:-MaxVerstappenWC2021}
  - TORRUST_INDEX_API_CORS_PERMISSIVE=${TORRUST_INDEX_API_CORS_PERMISSIVE:-true}
  - CARGO_HOME=/home/appuser/.cargo
  networks:

diff --git a/demo/config-index.local.toml b/demo/config-index.local.toml
@@ -1,4 +1,7 @@
-version = "2"
+[metadata]
+app = "torrust-index"
+purpose = "configuration"
+schema_version = "2.0.0"
 
 [logging]
 #threshold = "off"

diff --git a/demo/config-tracker.local.toml b/demo/config-tracker.local.toml
@@ -1,4 +1,7 @@
-version = "2"
+[metadata]
+app = "torrust-tracker"
+purpose = "configuration"
+schema_version = "2.0.0"
 
 [logging]
 #threshold = "off"

diff --git a/demo/dot.env.local b/demo/dot.env.local
@@ -10,7 +10,7 @@ USER_ID=1000
 ### Index
 TORRUST_INDEX_CONFIG_TOML=
 TORRUST_INDEX_API_CORS_PERMISSIVE=true
-TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__SECRET_KEY='MaxVerstappenWC2021'
+TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__USER_CLAIM_TOKEN_PEPPER='MaxVerstappenWC2021'
 TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN='MyAccessToken'
 
 ### Tracker

diff --git a/demo/storage/index/etc/index.toml b/demo/storage/index/etc/index.toml
@@ -1,4 +1,7 @@
-version = "2"
+[metadata]
+app = "torrust-index"
+purpose = "configuration"
+schema_version = "2.0.0"
 
 [logging]
 #threshold = "off"

diff --git a/demo/storage/tracker/etc/tracker.toml b/demo/storage/tracker/etc/tracker.toml
@@ -1,4 +1,7 @@
-version = "2"
+[metadata]
+app = "torrust-tracker"
+purpose = "configuration"
+schema_version = "2.0.0"
 
 [logging]
 #threshold = "off"

diff --git a/droplet/.env.production b/droplet/.env.production
@@ -8,7 +8,7 @@ NITRO_PORT=3000
 # Index
 TORRUST_INDEX_CONFIG_TOML=
 TORRUST_INDEX_API_CORS_PERMISSIVE=false
-TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__SECRET_KEY='MaxVerstappenWC2021'
+TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__USER_CLAIM_TOKEN_PEPPER='MaxVerstappenWC2021'
 TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN='MyAccessToken'
 
 # Tracker

diff --git a/droplet/compose.yaml b/droplet/compose.yaml
@@ -74,7 +74,7 @@ services:
  - TORRUST_INDEX_DATABASE=${TORRUST_INDEX_DATABASE:-sqlite3}
  - TORRUST_INDEX_DATABASE_DRIVER=${TORRUST_INDEX_DATABASE_DRIVER:-sqlite3}
  - TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN=${TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN:-MyAccessToken}
- - TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__SECRET_KEY=${TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__SECRET_KEY:-MaxVerstappenWC2021}
+ - TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__USER_CLAIM_TOKEN_PEPPER=${TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__USER_CLAIM_TOKEN_PEPPER:-MaxVerstappenWC2021}
  - TORRUST_INDEX_API_CORS_PERMISSIVE=${TORRUST_INDEX_API_CORS_PERMISSIVE:-true}
  networks:
  - backend_network

diff --git a/droplet/share/container/default/config/index.prod.container.sqlite3.toml b/droplet/share/container/default/config/index.prod.container.sqlite3.toml
@@ -1,4 +1,7 @@
-version = "2"
+[metadata]
+app = "torrust-index"
+purpose = "configuration"
+schema_version = "2.0.0"
 
 [logging]
 #threshold = "off"

diff --git a/droplet/share/container/default/config/tracker.prod.container.sqlite3.toml b/droplet/share/container/default/config/tracker.prod.container.sqlite3.toml
@@ -1,4 +1,7 @@
-version = "2"
+[metadata]
+app = "torrust-tracker"
+purpose = "configuration"
+schema_version = "2.0.0"
 
 [logging]
 #threshold = "off"