From 9410b2b73bb6c974df484303c66a00430981e256 Mon Sep 17 00:00:00 2001
From: Nicolas Meienberger <github@thisprops.com>
Date: Tue, 4 Jul 2023 17:18:29 +0200
Subject: [PATCH] fix(databag): add correct network and traefik labels

---
 apps/databag/config.json                     |   2 +-
 apps/databag/docker-compose.yml              |  43 ++++++++++++++++---
 apps/databag/metadata/{icon.png => logo.jpg} | Bin
 3 files changed, 37 insertions(+), 8 deletions(-)
 rename apps/databag/metadata/{icon.png => logo.jpg} (100%)

diff --git a/apps/databag/config.json b/apps/databag/config.json
index 5009df3d..1c0ca180 100644
--- a/apps/databag/config.json
+++ b/apps/databag/config.json
@@ -3,7 +3,7 @@
   "name": "Databag",
   "available": true,
   "exposable": true,
-  "port": 7000,
+  "port": 8201,
   "id": "databag",
   "tipi_version": 2,
   "version": "latest",
diff --git a/apps/databag/docker-compose.yml b/apps/databag/docker-compose.yml
index 8940c505..debdd253 100644
--- a/apps/databag/docker-compose.yml
+++ b/apps/databag/docker-compose.yml
@@ -1,9 +1,38 @@
 version: "3.9"
 services:
- databag:
-   container_name: databag
-   image: balzack/databag:latest
-   ports:
-     - ${APP_PORT}:7000
-   volumes:
-     - ${APP_DATA_DIR}/data/databag:/var/lib/databag
+  databag:
+    container_name: databag
+    image: balzack/databag:latest
+    ports:
+      - ${APP_PORT}:7000
+    volumes:
+      - ${APP_DATA_DIR}/data/databag:/var/lib/databag
+    networks:
+      - tipi_main_network
+    labels:
+      # Main
+      traefik.enable: true
+      traefik.http.middlewares.databag-web-redirect.redirectscheme.scheme: https
+      traefik.http.services.databag.loadbalancer.server.port: 7000
+      # Web
+      traefik.http.routers.databag-insecure.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.databag-insecure.entrypoints: web
+      traefik.http.routers.databag-insecure.service: databag
+      traefik.http.routers.databag-insecure.middlewares: databag-web-redirect
+      # Websecure
+      traefik.http.routers.databag.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.databag.entrypoints: websecure
+      traefik.http.routers.databag.service: databag
+      traefik.http.routers.databag.tls.certresolver: myresolver
+      # Local domain
+      traefik.http.routers.databag-local-insecure.rule: Host(`databag.${LOCAL_DOMAIN}`)
+      traefik.http.routers.databag-local-insecure.entrypoints: web
+      traefik.http.routers.databag-local-insecure.service: databag
+      traefik.http.routers.databag-local-insecure.middlewares: databag-web-redirect
+      # Local domain secure
+      traefik.http.routers.databag-local.rule: Host(`databag.${LOCAL_DOMAIN}`)
+      traefik.http.routers.databag-local.entrypoints: websecure
+      traefik.http.routers.databag-local.service: databag
+      traefik.http.routers.databag-local.tls: true
+
+
diff --git a/apps/databag/metadata/icon.png b/apps/databag/metadata/logo.jpg
similarity index 100%
rename from apps/databag/metadata/icon.png
rename to apps/databag/metadata/logo.jpg