Gurulandia/Homelab
1
0
Fork 0
Code Pull Requests Actions Wiki Activity

fix file tabulators

Browse Source
This commit is contained in:
Gurulandia
2025-02-07 11:11:26 +02:00
parent eb12831665
commit a8cf3f1bba
3 changed files with 52 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
docker/joplin-server/behind-proxy-with-db/compose.override.yaml
View File

@@ -1,25 +1,25 @@
services: services:
joplin-server: joplin-server:
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
## HTTP Routers ## HTTP Routers
- "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.entrypoints=https" - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.entrypoints=https"
- "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.rule=Host(`${JOPLIN_HOSTNAME}.$DOMAINNAME1`)" - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.rule=Host(`${JOPLIN_HOSTNAME}.$DOMAINNAME1`)"
## Middlewares ## Middlewares
# - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.middlewares=chain-authelia@file" # - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.middlewares=chain-authelia@file"
- "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.middlewares=chain-no-auth@file" - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.middlewares=chain-no-auth@file"
## HTTP Services ## HTTP Services
- "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.service=${JOPLIN_HOSTNAME}-svc" - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.service=${JOPLIN_HOSTNAME}-svc"
- "traefik.http.services.${JOPLIN_HOSTNAME}-svc.loadbalancer.server.port=22300" - "traefik.http.services.${JOPLIN_HOSTNAME}-svc.loadbalancer.server.port=22300"
depends_on: depends_on:
- db - db
env_file: env_file:
- path: ../../env/.env.joplin-srv.withdb - path: ../../env/.env.joplin-srv.withdb
db: db:
image: ${JOPLINDB_IMAGE}:${JOPLINDB_TAG} image: ${JOPLINDB_IMAGE}:${JOPLINDB_TAG}
container_name: ${JOPLINDB_CONTAINER_NAME} container_name: ${JOPLINDB_CONTAINER_NAME}
restart: ${JOPLINDB_RESTART_POLICY} restart: ${JOPLINDB_RESTART_POLICY}
env_file: env_file:
- path: ../../env/.env.joplin-srv.db-cred - path: ../../env/.env.joplin-srv.db-cred
networks: networks:
- ${JOPLIN_NETWORk_ID} - ${JOPLIN_NETWORk_ID}

23
docker/joplin-server/behind-proxy/compose.override.yaml
View File

@@ -1,13 +1,14 @@
services: services:
joplin-server: joplin-server:
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
## HTTP Routers ## HTTP Routers
- "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.entrypoints=https" - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.entrypoints=https"
- "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.rule=Host(`${JOPLIN_HOSTNAME}.$DOMAINNAME1`)" - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.rule=Host(`${JOPLIN_HOSTNAME}.$DOMAINNAME1`)"
## Middlewares ## Middlewares
# - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.middlewares=chain-authelia@file" # - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.middlewares=chain-authelia@file"
- "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.middlewares=chain-no-auth@file" - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.middlewares=chain-no-auth@file"
## HTTP Services ## HTTP Services
- "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.service=${JOPLIN_HOSTNAME}-svc" - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.service=${JOPLIN_HOSTNAME}-svc"
- "traefik.http.services.${JOPLIN_HOSTNAME}-svc.loadbalancer.server.port=22300" - "traefik.http.services.${JOPLIN_HOSTNAME}-svc.loadbalancer.server.port=22300"

34
docker/joplin-server/with-db/compose.override.yaml
View File

@@ -1,18 +1,18 @@
services: services:
joplin-server: joplin-server:
depends_on: depends_on:
- db - db
# ports: # ports:
# - "22300:22300" # - "22300:22300"
env_file: env_file:
- path: ../../env/.env.joplin-srv.withdb - path: ../../env/.env.joplin-srv.withdb
db: db:
image: ${JOPLINDB_IMAGE}:${JOPLINDB_TAG} image: ${JOPLINDB_IMAGE}:${JOPLINDB_TAG}
container_name: ${JOPLINDB_CONTAINER_NAME} container_name: ${JOPLINDB_CONTAINER_NAME}
restart: ${JOPLINDB_RESTART_POLICY} restart: ${JOPLINDB_RESTART_POLICY}
env_file: env_file:
- path: ../../env/.env.joplin-srv.db-cred - path: ../../env/.env.joplin-srv.db-cred
# ports: # ports:
# - "5432:5432" # - "5432:5432"
networks: networks:
- ${JOPLIN_NETWORk_ID} - ${JOPLIN_NETWORk_ID}