Compare commits
10 Commits
672f70183f
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
61020cae89 | ||
|
|
3b4c5192de | ||
|
|
0cc36de415 | ||
|
|
b1466137f9 | ||
|
|
9950853d86 | ||
|
|
eddc156d6f | ||
|
|
699198d057 | ||
|
|
854c046698 | ||
|
|
bcda415e27 | ||
|
|
03363e6994 |
@@ -20,8 +20,7 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
labels:
|
labels:
|
||||||
traefik.enable: true
|
traefik.enable: true
|
||||||
# Authentication in Immich directly
|
traefik.http.routers.immich.middlewares: authelia@file
|
||||||
# traefik.http.routers.immich.middlewares: authelia@file
|
|
||||||
|
|
||||||
immich-machine-learning:
|
immich-machine-learning:
|
||||||
hostname: immich-machine-learning
|
hostname: immich-machine-learning
|
||||||
|
|||||||
@@ -4,7 +4,8 @@ services:
|
|||||||
traefik:
|
traefik:
|
||||||
hostname: traefik
|
hostname: traefik
|
||||||
image: traefik
|
image: traefik
|
||||||
user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
|
# TODO: Run as non root user
|
||||||
|
#user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
|
||||||
environment:
|
environment:
|
||||||
NASCOMPOSE_DOMAIN: ${NASCOMPOSE_DOMAIN?}
|
NASCOMPOSE_DOMAIN: ${NASCOMPOSE_DOMAIN?}
|
||||||
CF_DNS_API_TOKEN_FILE: /run/secrets/cf_dns_token
|
CF_DNS_API_TOKEN_FILE: /run/secrets/cf_dns_token
|
||||||
@@ -27,6 +28,23 @@ services:
|
|||||||
traefik.enable: true
|
traefik.enable: true
|
||||||
traefik.http.routers.traefik.service: api@internal
|
traefik.http.routers.traefik.service: api@internal
|
||||||
traefik.http.routers.traefik.middlewares: authelia@file
|
traefik.http.routers.traefik.middlewares: authelia@file
|
||||||
|
# crowdsec:
|
||||||
|
# hostname: crowdsec
|
||||||
|
# image: crowdsecurity/crowdsec
|
||||||
|
# environment:
|
||||||
|
# COLLECTIONS: "crowdsecurity/traefik"
|
||||||
|
# GID: ${NASCOMPOSE_GID?}
|
||||||
|
# networks:
|
||||||
|
# - reverse-proxy
|
||||||
|
# volumes:
|
||||||
|
# - ${NASCOMPOSE_SERVICES?}/reverse-proxy/configs/crowdsec_acquis.yml:/etc/crowdsec/acquis.yaml
|
||||||
|
# - ${NASCOMPOSE_SERVICES?}/reverse-proxy/volumes/crowdsec_config/:/etc/crowdsec/
|
||||||
|
# - ${NASCOMPOSE_SERVICES?}/reverse-proxy/volumes/crowdsec_data/:/var/lib/crowdsec/data/
|
||||||
|
# - ${NASCOMPOSE_SERVICES?}/reverse-proxy/volumes/traefik_logs/:/var/log/traefik/:ro
|
||||||
|
# restart: unless-stopped
|
||||||
|
# labels:
|
||||||
|
# traefik.enable: true
|
||||||
|
# traefik.http.routers.crowdsec.middlewares: authelia@file
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
reverse-proxy:
|
reverse-proxy:
|
||||||
|
|||||||
@@ -25,8 +25,6 @@ services:
|
|||||||
dns:
|
dns:
|
||||||
- 1.1.1.1
|
- 1.1.1.1
|
||||||
- 1.0.0.1
|
- 1.0.0.1
|
||||||
devices:
|
|
||||||
- /dev/net/tun:/dev/net/tun
|
|
||||||
volumes:
|
volumes:
|
||||||
- ${NASCOMPOSE_SERVICES?}/torrents${TORRENT_SUFFIX?}/volumes/qbittorrent_config/:/config/
|
- ${NASCOMPOSE_SERVICES?}/torrents${TORRENT_SUFFIX?}/volumes/qbittorrent_config/:/config/
|
||||||
- ${NASCOMPOSE_DATA?}/torrents${TORRENT_SUFFIX?}/:/data/torrents/
|
- ${NASCOMPOSE_DATA?}/torrents${TORRENT_SUFFIX?}/:/data/torrents/
|
||||||
@@ -35,7 +33,7 @@ services:
|
|||||||
- ${NASCOMPOSE_SERVICES?}/torrents${TORRENT_SUFFIX?}/config/99-cron-start:/etc/cont-init.d/99-cron-start:ro
|
- ${NASCOMPOSE_SERVICES?}/torrents${TORRENT_SUFFIX?}/config/99-cron-start:/etc/cont-init.d/99-cron-start:ro
|
||||||
- ${NASCOMPOSE_SERVICES?}/torrents${TORRENT_SUFFIX?}/config/updateMaMIP:/etc/periodic/hourly/updateMaMIP:ro
|
- ${NASCOMPOSE_SERVICES?}/torrents${TORRENT_SUFFIX?}/config/updateMaMIP:/etc/periodic/hourly/updateMaMIP:ro
|
||||||
# Secrets
|
# Secrets
|
||||||
- ${NASCOMPOSE_SERVICES?}/torrents${TORRENT_SUFFIX?}/secrets/wg0-fix.conf:/config/wireguard/wg0-fix.conf:ro
|
- ${NASCOMPOSE_SERVICES?}/torrents${TORRENT_SUFFIX?}/secrets/wg0.conf:/config/wireguard/wg0-fix.conf:ro
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
labels:
|
labels:
|
||||||
- traefik.enable=true
|
- traefik.enable=true
|
||||||
|
|||||||
Reference in New Issue
Block a user