From fe02253b2da242e140be9392e1935fb90a4a38bf Mon Sep 17 00:00:00 2001
From: Jose Celano <josecelano@gmail.com>
Date: Fri, 14 Jun 2024 11:06:11 +0100
Subject: [PATCH] fix: [#6] update index configuration

To follow breaking changes in the Index config TOML files and env var
names.
---
 .gitleaks.toml                                    |  8 +++++---
 demo/compose.yaml                                 |  1 +
 demo/dot.env.local                                | 15 ++++++++++-----
 droplet/.env.production                           |  6 +++---
 droplet/compose.yaml                              |  1 +
 .../config/index.prod.container.sqlite3.toml      | 12 +++---------
 project-words.txt                                 |  4 ++--
 7 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/.gitleaks.toml b/.gitleaks.toml
index a1b8ddc..9d3b47e 100644
--- a/.gitleaks.toml
+++ b/.gitleaks.toml
@@ -7,16 +7,18 @@ useDefault = true
 [allowlist]
 paths = [
     '''.automation/test''',
-    '''megalinter-reports''',
     '''.github/linters''',
-    '''node_modules''',
     '''.mypy_cache''',
-    '''(.*?)gitleaks\.toml$''',
     '''(.*?)(png|jpg|gif|doc|docx|pdf|bin|xls|pyc|zip)$''',
+    '''(.*?)gitleaks\.toml$''',
     '''(go.mod|go.sum)$''',
     '''demo/config-idx-back.local.toml''',
     '''demo/config-index.local.toml''',
     '''demo/config-tracker.local.toml''',
+    '''demo/dot.env.local''',
+    '''droplet/.env.production''',
     '''droplet/share/container/default/config/index.prod.container.sqlite3.toml''',
+    '''megalinter-reports''',
+    '''node_modules''',
 ]
 description = "Allowlisted files"
diff --git a/demo/compose.yaml b/demo/compose.yaml
index fb038f2..ea9c786 100644
--- a/demo/compose.yaml
+++ b/demo/compose.yaml
@@ -29,6 +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_API_CORS_PERMISSIVE=${TORRUST_INDEX_API_CORS_PERMISSIVE:-true}
       - CARGO_HOME=/home/appuser/.cargo
     networks:
diff --git a/demo/dot.env.local b/demo/dot.env.local
index 8dce039..95323cf 100644
--- a/demo/dot.env.local
+++ b/demo/dot.env.local
@@ -1,13 +1,18 @@
-# App build variables
+## App build variables
 API_BASE_URL=http://localhost:3001/v1
 
-# Rust SQLx
+## Rust SQLx
 DATABASE_URL=sqlite://storage/database/data.db?mode=rwc
 
-# Docker compose
+## Docker compose
 USER_ID=1000
+
+### Index
 TORRUST_INDEX_CONFIG_TOML=
-TORRUST_INDEX_USER_UID=1000
+TORRUST_INDEX_API_CORS_PERMISSIVE=true
+TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__SECRET_KEY='MaxVerstappenWC2021'
+TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN='MyAccessToken'
+
+### Tracker
 TORRUST_TRACKER_CONFIG_TOML=
-TORRUST_TRACKER_USER_UID=1000
 TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN=MyAccessToken
diff --git a/droplet/.env.production b/droplet/.env.production
index 99613d4..603ff38 100644
--- a/droplet/.env.production
+++ b/droplet/.env.production
@@ -2,14 +2,14 @@ USER_ID=1000
 
 # Index GUI
 TORRUST_INDEX_GUI_API_BASE_URL='https://index.torrust-demo.com/api/v1'
-NITRO_HOST="0.0.0.0"
+NITRO_HOST=0.0.0.0
 NITRO_PORT=3000
 
 # Index
 TORRUST_INDEX_CONFIG_TOML=
-TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN='MyAccessToken'
-TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__SECRET_KEY='MyAccessToken'
 TORRUST_INDEX_API_CORS_PERMISSIVE=false
+TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__SECRET_KEY='MaxVerstappenWC2021'
+TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN='MyAccessToken'
 
 # Tracker
 TORRUST_TRACKER_CONFIG_TOML=
diff --git a/droplet/compose.yaml b/droplet/compose.yaml
index 5f6dc06..61a9ad3 100644
--- a/droplet/compose.yaml
+++ b/droplet/compose.yaml
@@ -74,6 +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_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
index 4d9b53d..608bd05 100644
--- a/droplet/share/container/default/config/index.prod.container.sqlite3.toml
+++ b/droplet/share/container/default/config/index.prod.container.sqlite3.toml
@@ -1,16 +1,10 @@
-# Please override the tracker token: 
-# `TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN`
-# And the auth screte key:
-# `TORRUST_INDEX_CONFIG_OVERRIDE_AUTH__SECRET_KEY`
-# environmental variables!
-
 [tracker]
-url = "udp://tracker.torrust-demo.com:6969"
 api_url = "http://tracker:1212"
+url = "udp://tracker.torrust-demo.com:6969"
 
 [database]
 connect_url = "sqlite:///var/lib/torrust/index/database/sqlite3.db?mode=rwc"
 
-[mail]
-server = "mailcatcher"
+[mail.smtp]
 port = 1025
+server = "mailcatcher"
diff --git a/project-words.txt b/project-words.txt
index a818c35..d847643 100644
--- a/project-words.txt
+++ b/project-words.txt
@@ -15,5 +15,5 @@ stefanzweifel
 torrust
 Torrust
 TORRUST
-TORRUST
-webroot
\ No newline at end of file
+Verstappen
+webroot