diff --git a/compose.yml b/compose.yml index 6c14d23..9da8c12 100644 --- a/compose.yml +++ b/compose.yml @@ -33,7 +33,7 @@ services: - ${LIDARR_PORT}:${LIDARR_PORT} # Lidarr #- ${SEERR_PORT}:${SEERR_PORT}/tcp # Seerr # took this out of gluetun, as it could cause issues with starting the container, and it was unecessary healthcheck: - test: wget --spider -q http://1.1.1.1 || exit 1 # ACTUALLY DUMB FUCK! gluetun itself DOES NOT NEED DNS! # the comment afterwards is stupid, if gluetun can't resolve some DNS name, then the other services can't either, they need to be able to look up databases # dont use google.com, since that requires DNS. if it fails to resolve, the container is forced to restart. This is bad, since we mostly don't need dns for things such as qbittorrent, or prowlarr itself + test: wget --spider -q http://1.1.1.1 || exit 1 interval: 30s timeout: 15s retries: 3 @@ -158,8 +158,8 @@ services: - TZ=${TIMEZONE} volumes: - /var/lib/sonarr:/config # had migrated into docker compose - - ${DISK1}:/media # too dangerous to change this - - ${DISK2}:/11tb_ext # too dangerous to change this + - ${DISK1}:${DISK1} + - ${DISK2}:${DISK2} labels: - "autoheal=true" network_mode: "container:gluetun" @@ -183,8 +183,8 @@ services: - TZ=${TIMEZONE} volumes: - /var/lib/radarr:/config # had migrated into docker compose - - ${DISK1}:/media # too dangerous to change this - - ${DISK2}:/11tb_ext # too dangerous to change this + - ${DISK1}:${DISK1} + - ${DISK2}:${DISK2} labels: - "autoheal=true" network_mode: "container:gluetun" @@ -298,7 +298,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock:ro # (optional) For docker integrations - ./gluetun-data:/tmp/gluetun:ro # get the port from port-updater environment: - - "HOMEPAGE_ALLOWED_HOSTS=gethomepage.dev,192.168.50.2:3000,shaan-server:3000,100.76.249.110:3000,ss:3000,shaan-server.tail:${HOMEPAGE_PORT}" # required, may need port. See gethomepage.dev/installation/#homepage_allowed_hosts + - "HOMEPAGE_ALLOWED_HOSTS=gethomepage.dev,192.168.50.2:${HOMEPAGE_PORT},shaan-server:${HOMEPAGE_PORT},100.76.249.110:${HOMEPAGE_PORT},ss:${HOMEPAGE_PORT},shaan-server.tail:${HOMEPAGE_PORT}" # required, may need port. See gethomepage.dev/installation/#homepage_allowed_hosts - "HOMEPAGE_VAR_DISK1=${DISK1}" - "HOMEPAGE_VAR_DISK2=${DISK2}" - "HOMEPAGE_VAR_DISK3=${DISK3}" @@ -343,9 +343,9 @@ services: - "HOMEPAGE_VAR_TERMIX_HOST=${WEB_PROTOCOL}://${SERVER_NAME}:${TERMIX_PORT}" extra_hosts: - "host.docker.internal:host-gateway" - networks: - staticaddress: - ipv4_address: 172.16.0.1 + #networks: + # staticaddress: + # ipv4_address: 172.200.0.2 restart: always glances: @@ -452,7 +452,7 @@ networks: staticaddress: ipam: config: - - subnet: "172.16.0.0/16" + - subnet: "172.200.0.0/16" volumes: myspeed: diff --git a/homepage/services.yaml b/homepage/services.yaml index 666b86c..4944c43 100644 --- a/homepage/services.yaml +++ b/homepage/services.yaml @@ -90,24 +90,6 @@ enableUser: false expandOneStreamToTwoRows: false - "Media_2x2": - - "Seerr >": - icon: sh-overseerr-light - href: "{{HOMEPAGE_VAR_SEERR_HOST}}" - description: Request - server: my-docker - container: seerr - siteMonitor: "{{HOMEPAGE_VAR_SEERR_ADDRESS}}" - widget: - type: seerr - url: "{{HOMEPAGE_VAR_SEERR_ADDRESS}}" - key: "{{HOMEPAGE_VAR_SEERR_KEY}}" - fields: [completed, pending] - highlight: - pending: - numeric: - - level: warn - when: gt - value: 0 - "Sonarr >": icon: sh-sonarr-light href: "{{HOMEPAGE_VAR_SONARR_HOST}}" @@ -163,6 +145,24 @@ - level: warn when: gt value: 0 + - "Seerr >": + icon: sh-overseerr-light + href: "{{HOMEPAGE_VAR_SEERR_HOST}}" + description: Request + server: my-docker + container: seerr + siteMonitor: "{{HOMEPAGE_VAR_SEERR_ADDRESS}}" + widget: + type: seerr + url: "{{HOMEPAGE_VAR_SEERR_ADDRESS}}" + key: "{{HOMEPAGE_VAR_SEERR_KEY}}" + fields: [completed, pending] + highlight: + pending: + numeric: + - level: warn + when: gt + value: 0 - "Media_oddballs": - "Tdarr >": icon: sh-tdarr @@ -291,13 +291,16 @@ highlight: "status": string: - - level: warn + - level: danger when: equals value: connected negate: true "DHT": #valueOnly: true numeric: + - level: danger + when: lte + value: 0 - level: warn when: lte value: 200