updates for new setup

This commit is contained in:
sky
2021-11-02 23:38:03 -04:00
parent e2696a4af5
commit 15c8dbc454
3 changed files with 57 additions and 116 deletions

View File

@@ -19,11 +19,12 @@ services:
PUID: 0
PGID: 0
LAN_NETWORK: 192.168.0.0/16
NAME_SERVERS: 192.168.1.11,1.1.1.1
NAME_SERVERS: 1.1.1.1
VPN_ENABLED: "yes"
VPN_PROV: custom
labels:
- "traefik.http.routers.nzbget.rule=Host(`nzbget.olympus.sherman.one`)"
- "traefik.http.routers.nzbget.entrypoints=web"
- "traefik.http.services.nzbget.loadbalancer.server.port=6789"
deluge:
@@ -49,6 +50,7 @@ services:
NAME_SERVERS: 192.168.1.11,1.1.1.1
labels:
- "traefik.http.routers.deluge.rule=Host(`deluge.olympus.sherman.one`)"
- "traefik.http.routers.deluge.entrypoints=web"
- "traefik.http.services.deluge.loadbalancer.server.port=8112"
jackett:
@@ -68,6 +70,7 @@ services:
- 192.168.1.1
labels:
- "traefik.http.routers.jackett.rule=Host(`jackett.olympus.sherman.one`)"
- "traefik.http.routers.jackett.entrypoints=web"
- "traefik.http.services.jackett.loadbalancer.server.port=9117"
sonarr:
@@ -88,6 +91,7 @@ services:
- 192.168.1.1
labels:
- "traefik.http.routers.sonarr.rule=Host(`sonarr.olympus.sherman.one`)"
- "traefik.http.routers.sonarr.entrypoints=web"
- "traefik.http.services.sonarr.loadbalancer.server.port=8989"
radarr:
@@ -108,6 +112,7 @@ services:
- 192.168.1.1
labels:
- "traefik.http.routers.radarr.rule=Host(`radarr.olympus.sherman.one`)"
- "traefik.http.routers.radarr.entrypoints=web"
- "traefik.http.services.radarr.loadbalancer.server.port=7878"
@@ -129,13 +134,15 @@ services:
- 192.168.1.1
labels:
- "traefik.http.routers.lidarr.rule=Host(`lidarr.olympus.sherman.one`)"
- "traefik.http.routers.lidarr.entrypoints=web"
- "traefik.http.services.lidarr.loadbalancer.server.port=8686"
jellyfin:
image: linuxserver/jellyfin
container_name: jellyfin
restart: unless-stopped
network_mode: host
ports:
- "8096:8096"
environment:
PUID: 1000
PGID: 1000
@@ -147,6 +154,9 @@ services:
- music:/data/music
dns:
- 192.168.1.1
labels:
- "traefik.http.routers.jellyfin.rule=Host(`media.sherman.one`)"
- "traefik.http.services.jellyfin.loadbalancer.server.port=8096"
rss:
@@ -161,13 +171,8 @@ services:
- 192.168.1.1
labels:
- "traefik.http.routers.freshrss.rule=Host(`rss.sherman.one`)"
- "traefik.http.routers.freshrss.tls=true"
- "traefik.http.routers.freshrss.tls.certresolver=le"
- "traefik.http.routers.freshrss.tls.domains[0].sans=*.sherman.one"
- "traefik.http.routers.freshrss.entrypoints=web-secure"
- "traefik.http.routers.freshrssredir.middlewares=file-https@file"
- "traefik.http.routers.freshrssredir.entrypoints=web"
- "traefik.http.routers.freshrssredir.rule=Host(`rss.sherman.one`)"
- "traefik.http.routers.freshrss.middlewares=rs"
- "traefik.http.services.freshrss.loadbalancer.server.port=80"
volumes:

View File

@@ -13,50 +13,40 @@ services:
volumes:
- mosquitto_config:/mosquitto/config
- mosquitto_data:/mosquitto/data
pihole:
image: pihole/pihole:latest
container_name: pihole
ports:
- "53:53"
- "53:53/udp"
networks:
- connector
environment:
TZ: 'America/New_York'
WEBPASSWORD: pass
VIRTUAL_HOST: pihole.olympus.sherman.one
volumes:
- 'pihole-etc:/etc/pihole/'
- 'pihole-dnsmasq:/etc/dnsmasq.d/'
dns:
- 127.0.0.1
- 1.1.1.1
restart: unless-stopped
labels:
- "traefik.http.routers.pihole.rule=Host(`pihole.olympus.sherman.one`)"
- "traefik.http.services.pihole.loadbalancer.server.port=80"
- "traefik.enable=false"
traefik:
image: traefik
container_name: traefik
restart: unless-stopped
command:
- "--providers.docker"
- "--api.insecure=true"
- "--entrypoints.web.address=:80"
- "--entrypoints.websecure.http.tls=true"
- "--entrypoints.websecure.http.tls.certresolver=le"
- "--entrypoints.websecure.address=:443"
- "--certificatesresolvers.le.acme.httpchallenge=true"
- "--certificatesresolvers.le.acme.httpchallenge.entrypoint=web"
- "--certificatesresolvers.le.acme.email=sky@sherman.one"
- "--certificatesresolvers.le.acme.storage=acme.json"
networks:
- connector
ports:
- "80:80"
- "443:443"
- "8080:8080"
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- traefik_config:/etc/traefik
environment:
CF_DNS_API_TOKEN: 2a6MNiw5LEwd35at7ZzLdIpDvIk98VM6HGHUkH6Y
dns:
- 192.168.1.1
labels:
- "traefik.http.routers.traefik.rule=Host(`traefik.olympus.sherman.one`)"
- "traefik.http.routers.traefik.entrypoints=web"
- "traefik.http.services.traefik.loadbalancer.server.port=8080"
- "traefik.http.middlewares.rs.redirectscheme.permanent=true"
- "traefik.http.middlewares.rs.redirectscheme.scheme=https"
volumes:
mosquitto_config:
@@ -69,16 +59,6 @@ volumes:
type: btrfs
o: rw,noatime,compress=zstd,subvol=@data/mosquitto
device: /dev/sdc
pihole-etc:
driver_opts:
type: btrfs
o: rw,noatime,compress=zstd,subvol=@config/pihole
device: /dev/sdc
pihole-dnsmasq:
driver_opts:
type: btrfs
o: rw,noatime,compress=zstd,subvol=@data/pihole
device: /dev/sdc
traefik_config:
driver_opts:
type: btrfs

View File

@@ -17,14 +17,9 @@ services:
PASSWORD: password
SUDO_PASSWORD: pass
labels:
- "traefik.http.routers.codeServerSecure.rule=Host(`code.sherman.one`)"
- "traefik.http.routers.codeServerSecure.tls=true"
- "traefik.http.routers.codeServerSecure.tls.certresolver=le"
- "traefik.http.routers.codeServerSecure.tls.domains[0].sans=*.sherman.one"
- "traefik.http.routers.codeServerSecure.entrypoints=web-secure"
- "traefik.http.routers.codeServer.rule=Host(`code.sherman.one`)"
- "traefik.http.routers.codeServer.entrypoints=web"
- "traefik.http.routers.codeServer.middlewares=file-https@file"
- "traefik.http.routers.codeServer.middlewares=rs"
- "traefik.http.services.codeServer.loadbalancer.server.port=8443"
bitwarden:
@@ -41,26 +36,8 @@ services:
- 192.168.1.1
labels:
- "traefik.http.routers.bitwarden.rule=Host(`pw.sherman.one`)"
- "traefik.http.routers.bitwarden.tls=true"
- "traefik.http.routers.bitwarden.tls.certresolver=le"
- "traefik.http.routers.bitwarden.tls.domains[0].sans=*.sherman.one"
- "traefik.http.routers.bitwarden.entrypoints=web-secure"
- "traefik.http.routers.bitwardenredirect.rule=Host(`pw.sherman.one`)"
- "traefik.http.routers.bitwardenredirect.entrypoints=web"
- "traefik.http.routers.bitwardenredirect.middlewares=file-https@file"
- "traefik.http.routers.bitwarden.middleware=rs"
hass:
image: homeassistant/home-assistant:stable
container_name: hass
restart: unless-stopped
network_mode: host
volumes:
- homeassistant_config:/config
dns:
- 192.168.1.1
environment:
TZ: America/New_York
grocy:
image: linuxserver/grocy
container_name: grocy
@@ -74,9 +51,8 @@ services:
dns:
- 192.168.1.1
labels:
- "traefik.http.routers.grocySecure.rule=Host(`grocy.sherman.one`)"
- "traefik.http.routers.grocySecure.tls=true"
- "traefik.http.routers.grocySecure.tls.certresolver=le"
- "traefik.http.routers.grocy.rule=Host(`grocy.sherman.one`)"
- "traefik.http.routers.grocy.middlewares=rs"
- "traefik.http.services.grocy.loadbalancer.server.port=80"
barcode-buddy:
@@ -91,6 +67,7 @@ services:
- 192.168.1.1
labels:
- "traefik.http.routers.bb.rule=Host(`bb.sherman.one`)"
- "traefik.http.routers.bb.middlewares=rs"
- "traefik.http.services.bb.loadbalancer.server.port=80"
git:
@@ -109,14 +86,8 @@ services:
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro
labels:
- "traefik.http.routers.gitearedirect.rule=Host(`git.sherman.one`)"
- "traefik.http.routers.gitearedirect.middlewares=file-https@file"
- "traefik.http.routers.gitearedirect.entrypoints=web"
- "traefik.http.routers.gitea.rule=Host(`git.sherman.one`)"
- "traefik.http.routers.gitea.tls=true"
- "traefik.http.routers.gitea.tls.certresolver=le"
- "traefik.http.routers.gitea.entrypoints=web-secure"
- "traefik.http.routers.gitea.tls.domains[0].sans=*.sherman.one"
- "traefik.http.routers.gitea.middlewares=rs"
- "traefik.http.services.gitea.loadbalancer.server.port=3000"
teedy:
@@ -129,45 +100,30 @@ services:
- teedy:/data
labels:
- "traefik.http.routers.teedy.rule=Host(`docs.sherman.one`)"
- "traefik.http.routers.teedy.middlewares=rs"
files:
build: files
container_name: fileserver
restart: unless-stopped
networks:
- connector
volumes:
- files:/var/www/localhost/htdocs/files/
labels:
- "traefik.http.routers.files.rule=Host(`sherman.one`)&&PathPrefix(`/files/`)"
- "traefik.http.routers.files.tls=true"
- "traefik.http.routers.files.tls.certresolver=le"
- "traefik.http.routers.files.entrypoints=web-secure"
- "traefik.http.routers.filesRedirect.rule=Host(`sherman.one`)&&PathPrefix(`/files/`)"
- "traefik.http.routers.filesRedirect.middlewares=file-https@file"
- "traefik.http.routers.filesRedirect.entrypoints=web"
minecraft:
image: itzg/minecraft-server
container_name: minecraft
restart: unless-stopped
volumes:
- minecraft:/data
dns:
- 192.168.1.1
ports:
- "25565:25565"
- "25575:25575"
environment:
EULA: "TRUE"
TYPE: "FORGE"
MEMORY: "10G"
VERSION: "1.12.2"
ENABLE_RCON: "TRUE"
RCON_PASSWORD: "password"
RCON_PORT: "25575"
MAX_TICK_TIME: -1
ALLOW_FLIGHT: "TRUE"
# minecraft:
# image: itzg/minecraft-server
# container_name: minecraft
# restart: unless-stopped
# volumes:
# - minecraft:/data
# dns:
# - 192.168.1.1
# ports:
# - "25565:25565"
# - "25575:25575"
# environment:
# EULA: "TRUE"
# TYPE: "FORGE"
# MEMORY: "10G"
# VERSION: "1.12.2"
# ENABLE_RCON: "TRUE"
# RCON_PASSWORD: "password"
# RCON_PORT: "25575"
# MAX_TICK_TIME: -1
# ALLOW_FLIGHT: "TRUE"