diff --git a/.docker/containers/homepage/custom.css b/.docker/containers/homepage/custom.css deleted file mode 100644 index e69de29..0000000 diff --git a/.docker/containers/homepage/custom.js b/.docker/containers/homepage/custom.js deleted file mode 100644 index e69de29..0000000 diff --git a/.docker/containers/homepage/docker.yaml b/.docker/containers/homepage/docker.yaml index 352c004..700512c 100644 --- a/.docker/containers/homepage/docker.yaml +++ b/.docker/containers/homepage/docker.yaml @@ -5,21 +5,9 @@ pihole: host: dockerproxy port: 2375 - qbittorrent-nox: - host: dockerproxy - port: 2375 - jackett: - host: dockerproxy - port: 2375 - flaresolverr: - host: dockerproxy - port: 2375 speedtest: host: dockerproxy port: 2375 - homepage: - host: dockerproxy - port: 2375 unbound: host: dockerproxy port: 2375 @@ -53,6 +41,21 @@ torrentstack-navidrome-1: host: dockerproxy port: 2375 - uptime-kuma: - host: dockerproxy + qbittorrent-nox: + host: "{{HOMEPAGE_VAR_qBittorrent_Nox_url}}" + port: 2375 + flaresolverr: + host: "{{HOMEPAGE_VAR_Flaresolverr_url}}" + port: 2375 + media-jellyfin-1: + host: "{{HOMEPAGE_VAR_Jellyfin_url}}" + port: 2375 + jackett: + host: "{{HOMEPAGE_VAR_Jackett_url}}" + port: 2375 + uptime-kuma: + host: "{{HOMEPAGE_VAR_Uptime_Kuma_url}}" + port: 2375 + memos: + host: "{{HOMEPAGE_VAR_Memos_url}}" port: 2375 diff --git a/.docker/containers/homepage/services.yaml b/.docker/containers/homepage/services.yaml index 3747030..d213f9c 100644 --- a/.docker/containers/homepage/services.yaml +++ b/.docker/containers/homepage/services.yaml @@ -4,10 +4,11 @@ href: https://jellyfin.peterdominguez.art/ icon: jellyfin.png description: The Free Software Media System - ping: https://jellyfin.peterdominguez.art + server: media-jellyfin-1 + container: media-jellyfin-1 widget: type: jellyfin - url: http://10.0.0.103:8096 + url: "{{HOMEPAGE_VAR_Jellyfin_url}}" key: "{{HOMEPAGE_VAR_jellyfin_key}}" enableBlocks: true enableNowPlaying: true @@ -38,14 +39,14 @@ token: "{{HOMEPAGE_VAR_navidrome_token}}" salt: "{{HOMEPAGE_VAR_navidrome_salt}}" - qBittorrent-nox: - href: http://10.0.0.121:8080/ + href: "{{HOMEPAGE_VAR_qBittorrent_Nox_url}}" icon: qbittorrent.png description: WebGUI for the qBittorrent client server: qbittorrent-nox container: qbittorrent-nox widget: type: qbittorrent - url: http://10.0.0.121:8080 + url: "{{HOMEPAGE_VAR_qBittorrent_Nox_url}}" username: "{{HOMEPAGE_VAR_qBittorrent_Nox_username}}" password: "{{HOMEPAGE_VAR_qBittorrent_Nox_password}}" enableLeechProgress: true @@ -54,25 +55,25 @@ - Networking: - pihole: - href: https://10.0.0.121:6346/admin + href: "{{HOMEPAGE_VAR_Pihole_url_admin}}" icon: pi-hole.png description: DNS sinkhole to block ads server: pihole container: pihole widget: type: pihole - url: https://10.0.0.121:6346 + url: "{{HOMEPAGE_VAR_Pihole_url}}" version: 6 key: "{{HOMEPAGE_VAR_FTLCONF_webserver_api_password}}" - Speed Test Tracker: - href: http://10.0.0.121:9080/ + href: "{{HOMEPAGE_VAR_Speed_Test_Tracker_url}}" icon: speedtest-tracker.png description: Self-hosted Internet speed monitoring server: speedtest-tracker container: speedtest-tracker widget: type: speedtest - url: http://10.0.0.121:9080 + url: "{{HOMEPAGE_VAR_Speed_Test_Tracker_url}}" version: 2 key: "{{HOMEPAGE_VAR_KEY_SPEEDTEST}}" bitratePrecision: 3 @@ -87,7 +88,7 @@ url: https://status.peterdominguez.art slug: homeserver - Flaresolverr: - href: http://10.0.0.121:8191/ + href: "{{HOMEPAGE_VAR_Flaresolverr_url}}" icon: flaresolverr.png description: Proxy server to bypass DDoS protection server: flaresolverr @@ -126,16 +127,13 @@ type: gitea url: https://git.peterdominguez.art key: "{{HOMEPAGE_VAR_forgejo_key}}" - - Jackett: - href: http://10.0.0.121:9117/ - icon: jackett.png - description: Free and open-source maintained indexer - server: jackett - container: jackett - widget: - type: jackett - url: http://10.0.0.121:9117 - password: "{{HOMEPAGE_VAR_jackett_password}}" + - Memos: + href: https://notes.peterdominguez.art + icon: memos.png + description: Open source, self-hosted notes + server: memos + container: memos + showStats: true - SearXNG: href: https://search.peterdominguez.art/ icon: searxng.png @@ -143,6 +141,16 @@ server: searxng container: searxng showStats: true + - Jackett: + href: "{{HOMEPAGE_VAR_Jackett_url}}" + icon: jackett.png + description: Free and open-source maintained indexer + server: jackett + container: jackett + widget: + type: jackett + url: "{{HOMEPAGE_VAR_Jackett_url}}" + password: "{{HOMEPAGE_VAR_jackett_password}}" - Hugo: href: https://peterdominguez.art icon: hugo.png @@ -151,16 +159,9 @@ container: torrentstack-lighttpd-1 showStats: true - meTube: - href: http://10.0.0.121:8081 + href: "{{HOMEPAGE_VAR_meTube_url}}" icon: metube.png description: Self-hosted YouTube downloader server: metube container: metube showStats: true - - Homepage: - href: https://home.peterdominguez.art - icon: homepage.png - description: A modern dashboard for your services - server: homepage - container: homepage - showStats: true diff --git a/.docker/stacks/home-network/docker-compose.yml b/.docker/stacks/home-network/docker-compose.yml index df1b2dd..f4e17a3 100644 --- a/.docker/stacks/home-network/docker-compose.yml +++ b/.docker/stacks/home-network/docker-compose.yml @@ -5,66 +5,6 @@ networks: config: - subnet: 172.20.0.0/16 services: - qbittorrent-nox: - # for debugging - #cap_add: - #- SYS_PTRACE - container_name: qbittorrent-nox - environment: - #- PAGID=10000 - #- PGID=1000 - #- PUID=1000 - - QBT_EULA=accept - - QBT_VERSION=latest - - QBT_WEBUI_PORT=8080 - #- TZ=UTC - #- UMASK=022 - image: qbittorrentofficial/qbittorrent-nox:latest - ports: - # for bittorrent traffic - - 6881:6881/tcp - - 6881:6881/udp - # for WebUI - - 8080:8080/tcp - read_only: true - stop_grace_period: 30m - tmpfs: - - /tmp - tty: true - volumes: - - /home/guts/docker:/config - - /media/PHDD1/torrents:/downloads - - /home/guts/VueTorrent:/VueTorrent - jackett: - image: lscr.io/linuxserver/jackett:latest - container_name: jackett - environment: - - PUID=1000 - - PGID=1000 - - TZ=Etc/UTC - - AUTO_UPDATE=true #optional - - RUN_OPTS= #optional - - volumes: - - /home/guts/docker:/config - - /media/Torrents:/downloads - ports: - - 9117:9117 - - restart: always - - flaresolverr: - # DockerHub mirror flaresolverr/flaresolverr:latest - image: alexfozor/flaresolverr:pr-1300-experimental - container_name: flaresolverr - environment: - - LOG_LEVEL=${LOG_LEVEL:-info} - - LOG_HTML=${LOG_HTML:-false} - - CAPTCHA_SOLVER=${CAPTCHA_SOLVER:-none} - - TZ=America/Santo_Domingo - ports: - - "${PORT:-8191}:8191" - restart: unless-stopped pihole: container_name: pihole image: pihole/pihole:latest @@ -131,7 +71,7 @@ services: - TASKS=1 # Allow access to viewing tasks (necessary when using Docker Swarm) - POST=0 # Disallow any POST operations (effectively read-only) ports: - - 127.0.0.1:2375:2375 + - 2375:2375 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro # Mounted as read-only restart: unless-stopped @@ -211,12 +151,6 @@ services: - SEARXNG_BASE_URL=http://${SEARXNG_HOSTNAME:-localhost}/ - UWSGI_WORKERS=${SEARXNG_UWSGI_WORKERS:-4} - UWSGI_THREADS=${SEARXNG_UWSGI_THREADS:-4} - cap_drop: - - ALL - cap_add: - - CHOWN - - SETGID - - SETUID logging: driver: "json-file" options: @@ -303,15 +237,6 @@ services: volumes: - /home/guts/docker/navidrome:/data - /media/network/music:/music:ro - uptime-kuma: - image: louislam/uptime-kuma:beta - container_name: uptime-kuma - volumes: - - /home/guts/docker/uptime-kuma:/app/data - - /var/run/docker.sock:/var/run/docker.sock:ro - ports: - - 3001:3001 - restart: always signal-cli-rest-api: image: bbernhard/signal-cli-rest-api:latest environment: @@ -321,3 +246,29 @@ services: - "5280:8080" #map docker port 8080 to host port 8080. volumes: - "/home/guts/docker/signal-cli:/home/.local/share/signal-cli" #map "signal-cli-config" folder on + memos: + image: neosmemo/memos:stable + container_name: memos + volumes: + - /home/guts/docker/memos:/var/opt/memos + ports: + - 5230:5230 + redlib: + image: quay.io/redlib/redlib:latest + restart: always + container_name: "redlib" + ports: + - 9548:8080 + user: nobody + read_only: true + security_opt: + - no-new-privileges:true + environment: + - REDLIB_DEFAULT_SHOW_NSFW=on + - REDLIB_DEFAULT_THEME=dracula + cap_drop: + - ALL + healthcheck: + test: ["CMD", "wget", "--spider", "-q", "--tries=1", "http://127.0.0.1:9548/settings"] + interval: 30s + timeout: 3s