From 9cd6eb3d5d254cf6f4d9ffc34d70dd8ff25a3770 Mon Sep 17 00:00:00 2001
From: Teck Meng <furyx@hotmail.com>
Date: Wed, 28 Feb 2024 16:44:18 +0800
Subject: [PATCH] Update environment variables and Traefik configuration

---
 .env                        |  5 +----
 acme/.gitignore             |  2 ++
 compose/traefik/traefik.yml | 30 +++++++++++++++---------------
 usersfile                   |  2 ++
 4 files changed, 20 insertions(+), 19 deletions(-)
 create mode 100644 acme/.gitignore
 create mode 100644 usersfile

diff --git a/.env b/.env
index d265695..7a20fc3 100644
--- a/.env
+++ b/.env
@@ -20,10 +20,7 @@ STREAMLIT_FIN_SERVER_PORT="8501"
 BAI_LOCATION="/bai"
 STREAMLIT_BAI_SERVER_PORT="8502"
 
-# user/pass
-DASHBOARD_USER=test
-DASHBOARD_PASSWORD=$$apr1$$2E4PEW8M$$/wEgFNKX71h.YYMywV7WZ/
-
+# The following are the environment variables for the OSRM service
 OSRM_ALGORITHM="mld"
 OSRM_THREADS=2
 OSRM_PORT=5000
diff --git a/acme/.gitignore b/acme/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/acme/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/compose/traefik/traefik.yml b/compose/traefik/traefik.yml
index 4f697e6..ffa286c 100644
--- a/compose/traefik/traefik.yml
+++ b/compose/traefik/traefik.yml
@@ -1,8 +1,8 @@
 log:
   level: DEBUG
-# api:
+api:
   # Dashboard
-  # dashboard: true
+  dashboard: true
   # https://docs.traefik.io/master/operations/api/#insecure
   # insecure: true
   
@@ -36,16 +36,16 @@ certificatesResolvers:
 
 http:
   routers:
-    # dashboard:
-    #   rule: "Host(`dashboard.furyhawk.lol`) && (PathPrefix(`/api`) || PathPrefix(`/dashboard`))"
-    #   entryPoints:
-    #     - web-secure
-    #   service: api@internal
-    #   middlewares:
-    #     - auth
-    #   tls:
-    #     # https://docs.traefik.io/master/routing/routers/#certresolver
-    #     certResolver: letsencrypt
+    dashboard:
+      rule: "Host(`dashboard.furyhawk.lol`) && PathPrefix(`/api`, `/dashboard`)"
+      entryPoints:
+        - web-secure
+      middlewares:
+        - auth
+      service: api@internal
+      tls:
+        # https://docs.traefik.io/master/routing/routers/#certresolver
+        certResolver: letsencrypt
     #     domains:
     #       - main: "furyhawk.lol"
     #         sans:
@@ -111,9 +111,9 @@ http:
         #       - "*.furyhawk.lol"
 
   middlewares:
-    # auth:
-    #   basicAuth:
-    #     users: "{{env "DASHBOARD_USER"}}:{{env "DASHBOARD_PASSWORD"}}"
+    auth:
+      basicAuth:
+        usersFile: "usersfile"
     csrf:
       # https://doc.traefik.io/traefik/middlewares/http/headers/#hostsproxyheaders
       # https://docs.djangoproject.com/en/dev/ref/csrf/#ajax
diff --git a/usersfile b/usersfile
new file mode 100644
index 0000000..3c3c6ad
--- /dev/null
+++ b/usersfile
@@ -0,0 +1,2 @@
+test:$apr1$H6uskkkW$IgXLP6ewTrSuBkTrqE8wj/
+test2:$apr1$d9hr9HBB$4HxwgUir3HP4EsggP/QNo0
\ No newline at end of file