Merge pull request #6 from meienberger/update/apps-expose

Update/apps expose

apps/booksonic/config.json

@@ -3,7 +3,7 @@
   "name": "Booksonic",
   "available": true,
   "port": 8040,
-  "tipi_version": 1,
+  "tipi_version": 2,
   "version": "latest",
   "id": "booksonic",
   "categories": ["books", "media"],

apps/booksonic/docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.9"
+version: "3.7"
 services:
   booksonic:
     image: lscr.io/linuxserver/booksonic-air:latest

apps/bookstack/config.json

@@ -4,7 +4,7 @@
   "available": true,
   "port": 8119,
   "id": "bookstack",
-  "tipi_version": 1,
+  "tipi_version": 2,
   "version": "22.07.3",
   "description": "BookStack is a simple, self-hosted, easy-to-use platform for organising and storing information. Default login: admin@admin.com password: password",
   "short_desc": "BookStack is a self-hosted platform for organising and storing information.",

apps/bookstack/docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.9"
+version: "3.7"
 services:
   bookstack:
     image: lscr.io/linuxserver/bookstack:22.07.3

apps/docker-compose.common.yml

@@ -1,4 +1,4 @@
-version: "3.9"
+version: "3.7"
 
 networks:
   tipi_main_network:

apps/freshrss/config.json

@@ -2,9 +2,10 @@
   "$schema": "../schema.json",
   "name": "FreshRSS",
   "available": true,
+  "exposable": true,
   "port": 8086,
   "id": "freshrss",
-  "tipi_version": 1,
+  "tipi_version": 2,
   "version": "1.19.2",
   "categories": ["utilities"],
   "description": "FreshRSS is a self-hosted RSS feed aggregator like Leed or Kriss Feed.\nIt is lightweight, easy to work with, powerful, and customizable.\n\nIt is a multi-user application with an anonymous reading mode. It supports custom tags. There is an API for (mobile) clients, and a Command-Line Interface.\n\nThanks to the WebSub standard (formerly PubSubHubbub), FreshRSS is able to receive instant push notifications from compatible sources, such as Mastodon, Friendica, WordPress, Blogger, FeedBurner, etc.\n\nFreshRSS natively supports basic Web scraping, based on XPath, for Web sites not providing any RSS / Atom feed.\n\nFinally, it supports extensions for further tuning.",

apps/freshrss/docker-compose.yml

@@ -15,6 +15,13 @@ services:
     restart: unless-stopped
     networks:
       - tipi_main_network
+    labels:
+      traefik.enable: ${APP_EXPOSED}
+      traefik.http.routers.freshrss.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.freshrss.entrypoints: websecure
+      traefik.http.routers.freshrss.service: freshrss
+      traefik.http.routers.freshrss.tls.certresolver: myresolver
+      traefik.http.services.freshrss.loadbalancer.server.port: 80
 
     # labels:
     #     traefik.enable: true

apps/ghost/config.json

@@ -3,8 +3,9 @@
   "name": "Ghost",
   "port": 8117,
   "available": true,
+  "exposable": true,
   "id": "ghost",
-  "tipi_version": 1,
+  "tipi_version": 2,
   "version": "5.7.0",
   "categories": ["social", "media"],
   "description": "Ghost is a powerful app for new-media creators to publish, share, and grow a business around their content. It comes with modern tools to build a website, publish content, send newsletters & offer paid subscriptions to members.",

apps/ghost/docker-compose.yml

@@ -22,6 +22,13 @@ services:
       - ${APP_DATA_DIR}/content:/var/lib/ghost/content
     networks:
       - tipi_main_network
+    labels:
+      traefik.enable: ${APP_EXPOSED}
+      traefik.http.routers.ghost.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.ghost.entrypoints: websecure
+      traefik.http.routers.ghost.service: ghost
+      traefik.http.routers.ghost.tls.certresolver: myresolver
+      traefik.http.services.ghost.loadbalancer.server.port: 2368
 
   ghostdb:
     container_name: ghostdb

apps/invidious/config.json

@@ -2,10 +2,11 @@
   "$schema": "../schema.json",
   "name": "Invidious",
   "available": true,
+  "exposable": true,
   "port": 8095,
   "id": "invidious",
   "version": "latest",
-  "tipi_version": 1,
+  "tipi_version": 2,
   "categories": ["media", "social"],
   "description": "Invidious is an open source alternative front-end to YouTube.",
   "short_desc": "An alternative front-end to YouTube",

apps/invidious/docker-compose.arm.yml

@@ -27,6 +27,13 @@ services:
       - invidious-db
     networks:
       - tipi_main_network
+    labels:
+      traefik.enable: ${APP_EXPOSED}
+      traefik.http.routers.invidious.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.invidious.entrypoints: websecure
+      traefik.http.routers.invidious.service: invidious
+      traefik.http.routers.invidious.tls.certresolver: myresolver
+      traefik.http.services.invidious.loadbalancer.server.port: 3000
 
   invidious-db:
     user: 1000:1000

apps/invidious/docker-compose.yml

@@ -28,6 +28,13 @@ services:
       - invidious-db
     networks:
       - tipi_main_network
+    labels:
+      traefik.enable: ${APP_EXPOSED}
+      traefik.http.routers.invidious.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.invidious.entrypoints: websecure
+      traefik.http.routers.invidious.service: invidious
+      traefik.http.routers.invidious.tls.certresolver: myresolver
+      traefik.http.services.invidious.loadbalancer.server.port: 3000
 
   invidious-db:
     user: 1000:1000

apps/libreddit/config.json

@@ -2,9 +2,10 @@
   "$schema": "../schema.json",
   "name": "LibReddit",
   "available": true,
+  "exposable": true,
   "port": 8105,
   "id": "libreddit",
-  "tipi_version": 1,
+  "tipi_version": 2,
   "version": "latest",
   "categories": ["social"],
   "description": "LibReddit is a bloat free reddit frontend written in Rust, no ads, no tracking and strong Content Security Policy prevents any request from going to reddit, everything is proxied.",

apps/libreddit/docker-compose.arm.yml

@@ -10,3 +10,10 @@ services:
     restart: unless-stopped
     networks:
       - tipi_main_network
+    labels:
+      traefik.enable: ${APP_EXPOSED}
+      traefik.http.routers.libreddit.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.libreddit.entrypoints: websecure
+      traefik.http.routers.libreddit.service: libreddit
+      traefik.http.routers.libreddit.tls.certresolver: myresolver
+      traefik.http.services.libreddit.loadbalancer.server.port: 8080

apps/libreddit/docker-compose.yml

@@ -10,3 +10,11 @@ services:
     restart: unless-stopped
     networks:
       - tipi_main_network
+    labels:
+      traefik.enable: ${APP_EXPOSED}
+      traefik.http.routers.libreddit.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.libreddit.entrypoints: websecure
+      traefik.http.routers.libreddit.service: libreddit
+      traefik.http.routers.libreddit.tls.certresolver: myresolver
+      traefik.http.services.libreddit.loadbalancer.server.port: 8080
+

apps/nextcloud/config.json

@@ -2,10 +2,11 @@
   "$schema": "../schema.json",
   "name": "Nextcloud",
   "available": true,
+  "exposable": true,
   "port": 8083,
   "id": "nextcloud",
-  "tipi_version": 1,
-  "version": "24.0.3",
+  "tipi_version": 2,
+  "version": "24.0.4",
   "categories": ["data"],
   "description": "Nextcloud is a self-hosted, open source, and fully-featured cloud storage solution for your personal files, office documents, and photos.",
   "short_desc": "Productivity platform that keeps you in control",

apps/nextcloud/docker-compose.yml

@@ -25,7 +25,7 @@ services:
       - tipi_main_network
 
   cron:
-    image: nextcloud:24.0.3-apache
+    image: nextcloud:24.0.4-apache
     restart: on-failure
     volumes:
       - ${APP_DATA_DIR}/data/nextcloud:/var/www/html
@@ -38,7 +38,7 @@ services:
 
   nextcloud:
     container_name: nextcloud
-    image: nextcloud:24.0.3-apache
+    image: nextcloud:24.0.4-apache
     restart: unless-stopped
     ports:
       - ${APP_PORT}:80
@@ -52,16 +52,17 @@ services:
       - POSTGRES_DB=nextcloud
       - NEXTCLOUD_ADMIN_USER=${NEXTCLOUD_ADMIN_USER}
       - NEXTCLOUD_ADMIN_PASSWORD=${NEXTCLOUD_ADMIN_PASSWORD}
-      - NEXTCLOUD_TRUSTED_DOMAINS=${INTERNAL_IP}:${APP_PORT}
+      - NEXTCLOUD_TRUSTED_DOMAINS=${INTERNAL_IP}:${APP_PORT} ${APP_DOMAIN}
     depends_on:
       - db-nextcloud
       - redis-nextcloud
     networks:
       - tipi_main_network
-    # labels:
-    #     traefik.enable: true
-    #     traefik.http.routers.nextcloud.rule: Host(`nextcloud.tipi.home`)
-    #     traefik.http.routers.nextcloud.service: nextcloud
-    #     traefik.http.routers.nextcloud.tls: true
-    #     traefik.http.routers.nextcloud.entrypoints: websecure
-    #     traefik.http.services.nextcloud.loadbalancer.server.port: 80
+    labels:
+      traefik.enable: ${APP_EXPOSED}
+      traefik.http.routers.nextcloud.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.nextcloud.entrypoints: websecure
+      traefik.http.routers.nextcloud.service: nextcloud
+      traefik.http.routers.nextcloud.tls.certresolver: myresolver
+      traefik.http.services.nextcloud.loadbalancer.server.port: 80
+

apps/plex/config.json

@@ -2,9 +2,10 @@
   "$schema": "../schema.json",
   "name": "Plex",
   "available": true,
+  "exposable": true,
   "port": 32400,
   "id": "plex",
-  "tipi_version": 3,
+  "tipi_version": 4,
   "version": "1.28.1",
   "url_suffix": "/web",
   "categories": ["media"],

apps/plex/docker-compose.yml

@@ -13,3 +13,10 @@ services:
       - ${APP_DATA_DIR}/data/config:/config
       - ${ROOT_FOLDER_HOST}/media/data:/media
     restart: unless-stopped
+    labels:
+      traefik.enable: ${APP_EXPOSED}
+      traefik.http.routers.plex.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.plex.entrypoints: websecure
+      traefik.http.routers.plex.service: plex
+      traefik.http.routers.plex.tls.certresolver: myresolver
+      traefik.http.services.plex.loadbalancer.server.port: 32400

apps/portainer/config.json

@@ -4,7 +4,7 @@
   "port": 9443,
   "available": true,
   "id": "portainer",
-  "tipi_version": 1,
+  "tipi_version": 2,
   "version": "2.14.2",
   "categories": ["utilities"],
   "description": "",

apps/portainer/docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.9"
+version: "3.7"
 
 services:
   portainer:

apps/readarr/config.json

@@ -4,7 +4,7 @@
   "available": true,
   "port": 8112,
   "id": "readarr",
-  "tipi_version": 1,
+  "tipi_version": 2,
   "version": "develop",
   "categories": ["books", "media"],
   "description": "",

apps/readarr/docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.9"
+version: "3.7"
 services:
   readarr:
     image: lscr.io/linuxserver/readarr:develop

apps/schema.json

@@ -12,6 +12,9 @@
     "available": {
       "type": "boolean"
     },
+    "exposable": {
+      "type": "boolean"
+    },
     "port": {
       "type": "integer",
       "minimum": 0,

apps/vaultwarden/config.json

@@ -2,9 +2,10 @@
   "$schema": "../schema.json",
   "name": "VaultWarden",
   "available": true,
+  "exposable": true,
   "port": 8107,
   "id": "vaultwarden",
-  "tipi_version": 1,
+  "tipi_version": 2,
   "version": "1.25.1",
   "categories": ["utilities"],
   "description": "Alternative implementation of the Bitwarden server API written in Rust and compatible with upstream Bitwarden clients, perfect for self-hosted deployment where running the official resource-heavy service might not be ideal.",

apps/vaultwarden/docker-compose.yml

@@ -14,3 +14,10 @@ services:
       - ${APP_DATA_DIR}/data:/data
     networks:
       - tipi_main_network
+    labels:
+      traefik.enable: ${APP_EXPOSED}
+      traefik.http.routers.vaultwarden.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.vaultwarden.entrypoints: websecure
+      traefik.http.routers.vaultwarden.service: vaultwarden
+      traefik.http.routers.vaultwarden.tls.certresolver: myresolver
+      traefik.http.services.vaultwarden.loadbalancer.server.port: 80

apps/wg-easy/config.json

@@ -7,7 +7,7 @@
     "ports": [51820]
   },
   "id": "wg-easy",
-  "tipi_version": 2,
+  "tipi_version": 3,
   "version": "7",
   "categories": ["network"],
   "description": "Access your homeserver from anywhere even on your mobile device. Wireguard-easy is a simple tool to configure and manage Wireguard VPN servers. It is written in Go and uses the official Wireguard client. You have to open and redirect port 51820 to your homeserver in order to connect.",

apps/wg-easy/docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+version: "3.7"
 services:
   wg-easy:
     container_name: wg-easy