fix: megalinter errors

josecelano · May 28, 2024 · 1251bed · 1251bed
1 parent ce186f3
commit 1251bed
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 17 deletions.
diff --git a/.gitleaks.toml b/.gitleaks.toml
@@ -1,14 +1,11 @@
 
 title = "gitleaks config"
-
 [extend]
 # useDefault will extend the base configuration with the default gitleaks config:
 # https://github.com/zricethezav/gitleaks/blob/master/config/gitleaks.toml
 useDefault = true
-
 [allowlist]
-    description = "Allowlisted files"
-    paths = [
+paths = [
     '''.automation/test''',
     '''megalinter-reports''',
     '''.github/linters''',
@@ -17,4 +14,8 @@ useDefault = true
     '''(.*?)gitleaks\.toml$''',
     '''(.*?)(png|jpg|gif|doc|docx|pdf|bin|xls|pyc|zip)$''',
     '''(go.mod|go.sum)$''',
-    '''demo/config-idx-back.local.toml''']
+    '''demo/config-index.local.toml''',
+    '''demo/config-tracker.local.toml''',
+    '''droplet/share/container/default/config/index.prod.container.sqlite3.toml''',
+]
+description = "Allowlisted files"
diff --git a/.mega-linter.yml b/.mega-linter.yml
@@ -1,3 +1,4 @@
+---
 # Configuration file for MegaLinter
 #
 # See all available variables at https://megalinter.io/latest/config-file/ and in

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -0,0 +1,5 @@
+{
+  "recommendations": [
+    "streetsidesoftware.code-spell-checker"
+  ]
+}
diff --git a/demo/.gitignore b/demo/.gitignore
@@ -0,0 +1 @@
+.env
diff --git a/demo/README.md b/demo/README.md
@@ -40,10 +40,10 @@ After starting the application you should see these running containers:
 
 ```s
 $ docker ps
-CONTAINER ID   IMAGE                            COMMAND                  CREATED          STATUS                    PORTS                                                                                            NAMES
-3e2549e339fc   torrust/index-frontend:develop   "docker-entrypoint.s…"   7 seconds ago    Up 6 seconds              0.0.0.0:3000->3000/tcp, :::3000->3000/tcp, 0.0.0.0:24678->24678/tcp, :::24678->24678/tcp         torrust-idx-fron-1
-b2c61c3cfd2a   torrust/index-backend:develop    "/app/main"              18 seconds ago   Up 6 seconds              3000/tcp, 0.0.0.0:3001->3001/tcp, :::3001->3001/tcp                                              torrust-idx-back-1
-2b06456f2ecf   torrust/tracker:develop          "/app/torrust-tracker"   28 seconds ago   Up 6 seconds              0.0.0.0:1212->1212/tcp, :::1212->1212/tcp, 0.0.0.0:6969->6969/udp, :::6969->6969/udp, 7070/tcp   torrust-tracker-1
-6c08728d8e91   mysql:8.0                        "docker-entrypoint.s…"   3 hours ago      Up 59 minutes (healthy)   0.0.0.0:3306->3306/tcp, :::3306->3306/tcp, 33060/tcp                                             torrust-mysql-1
-ca3da0894712   dockage/mailcatcher:0.8.2        "entrypoint mailcatc…"   3 hours ago      Up 59 minutes             0.0.0.0:1025->1025/tcp, :::1025->1025/tcp, 0.0.0.0:1080->1080/tcp, :::1080->1080/tcp             torrust-mailcatcher-1
+CONTAINER ID   IMAGE                       COMMAND                  CREATED         STATUS                            PORTS                                                                                                      NAMES
+a8bf2370e427   torrust/index-gui:develop   "/usr/local/bin/entrypoint.sh"   5 seconds ago   Up 3 seconds (health: starting)   0.0.0.0:3000->3000/tcp, :::3000->3000/tcp, 0.0.0.0:24678->24678/tcp, :::24678->24678/tcp                   torrust-index-gui-1
+302fe5775c8e   torrust/index:develop       "/usr/local/bin/entrypoint.sh"   5 seconds ago   Up 3 seconds (health: starting)   0.0.0.0:3001->3001/tcp, :::3001->3001/tcp                                                                  torrust-index-1
+911d250a5cd6   torrust/tracker:develop     "/usr/local/bin/entrypoint.sh"   5 seconds ago   Up 4 seconds (health: starting)   1313/tcp, 0.0.0.0:1212->1212/tcp, :::1212->1212/tcp, 7070/tcp, 0.0.0.0:6969->6969/udp, :::6969->6969/udp   torrust-tracker-1
+9e72b195abf1   mysql:8.0                   "docker-entrypoint.s…"   5 seconds ago   Up 4 seconds (healthy)            0.0.0.0:3306->3306/tcp, :::3306->3306/tcp, 33060/tcp                                                       torrust-mysql-1
+dd8db76545eb   dockage/mailcatcher:0.8.2   "entrypoint mailcatcher"   5 seconds ago   Up 4 seconds                      0.0.0.0:1025->1025/tcp, :::1025->1025/tcp, 0.0.0.0:1080->1080/tcp, :::1080->1080/tcp                       torrust-mailcatcher-1
 ```
diff --git a/demo/compose.yaml b/demo/compose.yaml
@@ -1,3 +1,4 @@
+---
 name: torrust
 services:
   index-gui:

diff --git a/droplet/README.md b/droplet/README.md
@@ -225,10 +225,10 @@ After starting the application you should see these running containers:
 ```s
 $ docker ps
 CONTAINER ID   IMAGE                       COMMAND                  CREATED         STATUS                   PORTS                                                                                                                                       NAMES
-fbed1b994c7a   nginx:mainline-alpine       "/docker-entrypoint.…"   4 minutes ago   Up 4 minutes             0.0.0.0:80->80/tcp, :::80->80/tcp, 0.0.0.0:443->443/tcp, :::443->443/tcp                                                                    proxy
-5d8e6fb74102   torrust/index-gui:develop   "/usr/local/bin/entr…"   4 minutes ago   Up 4 minutes (healthy)   0.0.0.0:3000->3000/tcp, :::3000->3000/tcp                                                                                                   index-gui
-60854e389bb7   torrust/index:develop       "/usr/local/bin/entr…"   4 minutes ago   Up 4 minutes (healthy)   0.0.0.0:3001->3001/tcp, :::3001->3001/tcp                                                                                                   index
-16b1a40d96f9   torrust/tracker:develop     "/usr/local/bin/entr…"   4 minutes ago   Up 4 minutes (healthy)   0.0.0.0:1212->1212/tcp, :::1212->1212/tcp, 0.0.0.0:7070->7070/tcp, :::7070->7070/tcp, 1313/tcp, 0.0.0.0:6969->6969/udp, :::6969->6969/udp   tracker
+fbed1b994c7a   nginx:mainline-alpine       "/docker-entrypoint.sh"   4 minutes ago   Up 4 minutes             0.0.0.0:80->80/tcp, :::80->80/tcp, 0.0.0.0:443->443/tcp, :::443->443/tcp                                                                    proxy
+5d8e6fb74102   torrust/index-gui:develop   "/usr/local/bin/entrypoint.sh"   4 minutes ago   Up 4 minutes (healthy)   0.0.0.0:3000->3000/tcp, :::3000->3000/tcp                                                                                                   index-gui
+60854e389bb7   torrust/index:develop       "/usr/local/bin/entrypoint.sh"   4 minutes ago   Up 4 minutes (healthy)   0.0.0.0:3001->3001/tcp, :::3001->3001/tcp                                                                                                   index
+16b1a40d96f9   torrust/tracker:develop     "/usr/local/bin/entrypoint.sh"   4 minutes ago   Up 4 minutes (healthy)   0.0.0.0:1212->1212/tcp, :::1212->1212/tcp, 0.0.0.0:7070->7070/tcp, :::7070->7070/tcp, 1313/tcp, 0.0.0.0:6969->6969/udp, :::6969->6969/udp   tracker
 ```
 
 Other commands are:

diff --git a/droplet/bin/ssl_renew.sh b/droplet/bin/ssl_renew.sh
@@ -9,7 +9,7 @@ cd /home/torrust/github/torrust/torrust-compose/droplet || exit
 #$COMPOSE run certbot renew --dry-run && $COMPOSE kill -s SIGHUP proxy
 
 # Renew certificates that are close to expiring and restart proxy server
-# to reload Nginx congiuration.
+# to reload Nginx configuration.
 $COMPOSE run certbot renew && $COMPOSE --ansi never restart proxy
 
 $DOCKER system prune -af
diff --git a/lychee.toml b/lychee.toml
@@ -0,0 +1 @@
+exclude_loopback = true
diff --git a/project-words.txt b/project-words.txt
@@ -1,9 +1,19 @@
+appuser
 certbot
 certonly
 DEVSKIM
 fullchain
+healthcheck
 KICS
 letsencrypt
+mailcatcher
+mysqladmin
+NUXT
 privkey
 regr
-webroot
+stefanzweifel
+torrust
+Torrust
+TORRUST
+TORRUST
+webroot