diff --git a/Compose-vpn.yaml b/Compose-vpn.yaml index ce8cc6b..d9a6d76 100644 --- a/Compose-vpn.yaml +++ b/Compose-vpn.yaml @@ -8,7 +8,9 @@ services: volumes: - /data/nfs/Baxter/Docker/gluetun:/gluetun networks: - - vpn + - netgrimoire + ports: + - 9117:9117 #jackett environment: - VPN_SERVICE_PROVIDER=private internet access - OPENVPN_USER=p1016182 @@ -18,9 +20,42 @@ services: - PGID=998 - PUID=1001 + jackett: + image: lscr.io/linuxserver/jackett:latest + container_name: jackett + environment: + - PUID=1001 + - PGID=998 + - TZ=America/Chicago + volumes: + - /DockerVol/jackett/config:/config + - /data/nfs/Baxter/Data:/data:shared + # ports: + # - 9117:9117 + # networks: + # - vpn + network_mode: "container:gluetun" + restart: unless-stopped + + labels: + - homepage.group=Jolly Roger + - homepage.name=Jackett + - homepage.icon=jackett.png + - homepage.href=http://jackett.netgrimoire.com + - homepage.description=Torrent Client + # - homepage.widget.type=lidarr + # - homepage.widget.url=http://lidarr:8686 + # - homepage.widget.key=189afec5b97440209775a192870a2815 + - kuma.jackett.http.name="Jackett" + - kuma.jackett.http.url=http://jackett:9117 + - caddy=jackett.netgrimoire.com + - caddy.import=authentik + - caddy.reverse_proxy="{{upstreams 9117}}" + + networks: - vpn: + netgrimoire external: true \ No newline at end of file diff --git a/arr.yaml b/arr.yaml index cbe8e29..04dc66c 100644 --- a/arr.yaml +++ b/arr.yaml @@ -178,41 +178,7 @@ services: - caddy.reverse_proxy="{{upstreams 8787}}" - jackett: - image: lscr.io/linuxserver/jackett:latest - container_name: jackett - environment: - - PUID=1001 - - PGID=998 - - TZ=America/Chicago - volumes: - - /DockerVol/jackett/config:/config - - /data/nfs/Baxter/Data:/data:shared - # ports: - # - 9117:9117 - # networks: - # - vpn - network_mode: "container:gluetun" - restart: unless-stopped - deploy: - placement: - constraints: - - node.hostname == docker2 - labels: - - homepage.group=Jolly Roger - - homepage.name=Jackett - - homepage.icon=jackett.png - - homepage.href=http://jackett.netgrimoire.com - - homepage.description=Torrent Client - # - homepage.widget.type=lidarr - # - homepage.widget.url=http://lidarr:8686 - # - homepage.widget.key=189afec5b97440209775a192870a2815 - - kuma.jackett.http.name="Jackett" - - kuma.jackett.http.url=http://jackett:9117 - - caddy=jackett.netgrimoire.com - - caddy.import=authentik - - caddy.reverse_proxy="{{upstreams 9117}}" - + networks: netgrimoire: external: true