From c27746c8480d16adb64e0ca155b6f5e1d1df4482 Mon Sep 17 00:00:00 2001 From: Roland Osborne Date: Fri, 30 Jun 2023 11:39:07 -0700 Subject: [PATCH 1/4] added new app databag --- apps/databag/config.json | 18 ++++++++++++++++++ apps/databag/docker-compose.yml | 9 +++++++++ apps/databag/metadata/description.md | 2 ++ apps/databag/metadata/icon.png | Bin 0 -> 31457 bytes 4 files changed, 29 insertions(+) create mode 100644 apps/databag/config.json create mode 100644 apps/databag/docker-compose.yml create mode 100644 apps/databag/metadata/description.md create mode 100644 apps/databag/metadata/icon.png diff --git a/apps/databag/config.json b/apps/databag/config.json new file mode 100644 index 00000000..5009df3d --- /dev/null +++ b/apps/databag/config.json @@ -0,0 +1,18 @@ +{ + "$schema": "../schema.json", + "name": "Databag", + "available": true, + "exposable": true, + "port": 7000, + "id": "databag", + "tipi_version": 2, + "version": "latest", + "categories": [ + "utilities" + ], + "description": "Databag is a federated chat app for self-hosting that focuses on user privacy and security; the service includes clients for iOS, Android, and browser.", + "short_desc": "Messenger for the Decentralized Web", + "author": "balzack", + "source": "https://github.com/balzack/databag", + "form_fields": [] +} diff --git a/apps/databag/docker-compose.yml b/apps/databag/docker-compose.yml new file mode 100644 index 00000000..8940c505 --- /dev/null +++ b/apps/databag/docker-compose.yml @@ -0,0 +1,9 @@ +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 diff --git a/apps/databag/metadata/description.md b/apps/databag/metadata/description.md new file mode 100644 index 00000000..98cb6c0b --- /dev/null +++ b/apps/databag/metadata/description.md @@ -0,0 +1,2 @@ +# Databag +Databag is a federated chat app for self-hosting that focuses on user privacy and security; the service includes clients for iOS, Android, and browser. diff --git a/apps/databag/metadata/icon.png b/apps/databag/metadata/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d77e859fba29904b0ecfd7ab263f3041eed51601 GIT binary patch literal 31457 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 S#mtZZ0000 Date: Fri, 30 Jun 2023 11:41:55 -0700 Subject: [PATCH 2/4] updated readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0279d488..88c8ae4d 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ This is the official repository for the Tipi App Store. It contains all the apps - [Conduit](https://gitlab.com/famedly/conduit) - Conduit is a simple, fast and reliable chat server written in Rust - [DailyTXT](https://github.com/PhiTux/DailyTxT) - Encrypted Diary Web-App - [Dash.](https://github.com/MauriceNino/dashdot) - A simple, modern server dashboard, primarily used by smaller private server +- [Databag](https://github.com/balzack/databag) - Databag is a federated chat app with clients for iOS, Android, and browser. - [Deluge](https://github.com/linuxserver/docker-deluge) - Deluge is a lightweight, Free Software, cross-platform BitTorrent client - [Deemix](https://gitlab.com/Bockiii/deemix-docker) - deemix is a barebone deezer downloader library built from the ashes of Deezloader Remix. - [DokuWiki](https://github.com/dokuwiki/dokuwiki) - DokuWiki is a simple to use and highly versatile Open Source wiki software From 6acd361bc5b30dd7f2154ba895baa35fa985768c Mon Sep 17 00:00:00 2001 From: Roland Osborne Date: Fri, 30 Jun 2023 11:45:07 -0700 Subject: [PATCH 3/4] reworded description --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 88c8ae4d..5776c112 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ This is the official repository for the Tipi App Store. It contains all the apps - [Conduit](https://gitlab.com/famedly/conduit) - Conduit is a simple, fast and reliable chat server written in Rust - [DailyTXT](https://github.com/PhiTux/DailyTxT) - Encrypted Diary Web-App - [Dash.](https://github.com/MauriceNino/dashdot) - A simple, modern server dashboard, primarily used by smaller private server -- [Databag](https://github.com/balzack/databag) - Databag is a federated chat app with clients for iOS, Android, and browser. +- [Databag](https://github.com/balzack/databag) - A tiny federated messenger web with clients for iOS, Android, and browser. - [Deluge](https://github.com/linuxserver/docker-deluge) - Deluge is a lightweight, Free Software, cross-platform BitTorrent client - [Deemix](https://gitlab.com/Bockiii/deemix-docker) - deemix is a barebone deezer downloader library built from the ashes of Deezloader Remix. - [DokuWiki](https://github.com/dokuwiki/dokuwiki) - DokuWiki is a simple to use and highly versatile Open Source wiki software From 9410b2b73bb6c974df484303c66a00430981e256 Mon Sep 17 00:00:00 2001 From: Nicolas Meienberger Date: Tue, 4 Jul 2023 17:18:29 +0200 Subject: [PATCH 4/4] 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