.env.sample

@@ -56,7 +56,6 @@ MINECRAFT_AMP_LICENSE=
 WIREGUARD_VPN_PORT=51820
 WIREGUARD_PEERS=
 
-CARTRACKER_PG_PWD=
 CARTRACKER_OIDC_ID=
 CARTRACKER_OIDC_SECRET=
 CARTRACKER_OIDC_URL_AUTH=

services/cartracker/docker-compose.yml

@@ -9,7 +9,6 @@
 # Go to settings and enable auth, enter credentials to create admin/root user.
 # Set variables to true afterwards
 
-
 services:
   cartracker:
     image: ghcr.io/hargata/lubelogger:v1.3.8
@@ -20,12 +19,10 @@ services:
       - LC_ALL=de_DE.UTF-8
       - LANG=de_DE.UTF-8
 
-      - MailConfig__EmailServer=mail
+      - MailConfig__EmailServer=post.${BASE_DOMAIN}
       - MailConfig__EmailFrom=cars@${BASE_DOMAIN}
       - MailConfig__Port=25
 
-      - POSTGRES_CONNECTION="Host=pg-cartracker:5432;Username=cartracker;Password=${CARTRACKER_PG_PWD:-cartracker};Database=cartracker;"
-
       - OpenIDConfig__Name=authentik                                              # Name of the OpenID Connect Provider
       - OpenIDConfig__ClientId=${CARTRACKER_OIDC_ID}                              # Client Id to Authenticate with the Provider
       - OpenIDConfig__ClientSecret=${CARTRACKER_OIDC_SECRET}                      # Client Secret to Authenticate with the Provider
@@ -38,14 +35,7 @@ services:
       - OpenIDConfig__UsePKCE=true                                                # true/false(default: false) - whether LubeLogger should use PKCE
       - OpenIDConfig__DisableRegularLogin=true                                    # true/false(default: false) - auto re-direct user to OIDC login.
 
-      - EnableAuth=true       # true/false(default: false) - Allows users to configure whether if authentication is enabled via environment variable.
-      # - UserNameHash=       # SHA256 Hash of the root username.
-      # - UserPasswordHash=   # SHA256 Hash of the root password.
-
-      # - LUBELOGGER_ALLOWED_FILE_EXTENSIONS=   # Allowed file extensions for document uploads, use '*' to allow all file types.
-      # - LUBELOGGER_LOGO_URL=                  # Custom Logo URL.
-      # - LUBELOGGER_MOTD=                      # Message of The Day displayed in Login page if configured.
-      # - LUBELOGGER_WEBHOOK=                   # WebHook URL
+      - EnableAuth=true                                                           # true/false(default: false) - whether authentication is enabled by default.
     volumes:
       - ${BASE_DIR:-/srv}/cartracker/config:/App/config
       - ${BASE_DIR:-/srv}/cartracker/data:/App/data
@@ -54,20 +44,6 @@ services:
       - ${BASE_DIR:-/srv}/cartracker/images:/App/wwwroot/images
       - ${BASE_DIR:-/srv}/cartracker/log:/App/log
       - ${BASE_DIR:-/srv}/cartracker/keys:/root/.aspnet/DataProtection-Keys
-    depends_on:
-      - pg-cartracker
     networks:
       - proxy
-
-  pg-cartracker:
-    image: postgres:16-alpine
-    container_name: pg-cartracker
-    restart: "${RESTART:-no}"
-    environment:
-      - POSTGRES_DB=cartracker
-      - POSTGRES_USER=cartracker
-      - POSTGRES_PASSWORD=${CARTRACKER_PG_PWD:-cartracker}
-    volumes:
-      - ${BASE_DIR:-/srv}/cartracker/psql:/var/lib/postgresql/data
-    networks:
-      - cartracker
+      - mail

services/proxy/Caddyfile

@@ -176,3 +176,8 @@ money.{$BASE_DOMAIN} {
     # actual site config
     reverse_proxy money:5006
 }
+
+cars.{$BASE_DOMAIN} {
+  import default
+  reverse_proxy cartracker:8080
+}