From 4938453905f0f3d8ce50e8e73467b36435ea27f8 Mon Sep 17 00:00:00 2001
From: Peter Wood <peter@peterwood.dev>
Date: Thu, 2 Nov 2023 15:25:14 +0000
Subject: [PATCH] update media and added vaultwarden

---
 media/docker-compose.yml       | 42 +++++++++++++++++++---------------
 vaultwarden/docker-compose.yml | 21 +++++++++++++++++
 2 files changed, 44 insertions(+), 19 deletions(-)
 create mode 100644 vaultwarden/docker-compose.yml

diff --git a/media/docker-compose.yml b/media/docker-compose.yml
index 7ca3ee8..274a0d6 100644
--- a/media/docker-compose.yml
+++ b/media/docker-compose.yml
@@ -2,6 +2,7 @@ version: "3"
 services:
   gluetun:
     image: qmcgaw/gluetun:latest
+    pull_policy: always
     container_name: gluetun
     # line above must be uncommented to allow external containers to connect. See https://github.com/qdm12/gluetun/wiki/Connect-a-container-to-gluetun#external-container-to-gluetun
     cap_add:
@@ -26,9 +27,10 @@ services:
       - SERVER_COUNTRIES=United States
       # - SERVER_CITIES=Stockholm
       # - SERVER_HOSTNAMES: Comma separated list of server hostnames
-    restart: always
+    restart: unless-stopped
   sabnzbd:
     image: lscr.io/linuxserver/sabnzbd:latest
+    pull_policy: always
     container_name: sabnzbd
     environment:
       - PUID=1000
@@ -41,10 +43,11 @@ services:
       - /data/usenet/incomplete-downloads:/incomplete-downloads
     # network_mode: "service:gluetun" forces sabnzbd to connect to the internet through the VPN defined in the gluetun container above
     network_mode: "service:gluetun"
-    restart: always
+    restart: unless-stopped
   sonarr:
     image: lscr.io/linuxserver/sonarr:latest
     container_name: sonarr
+    pull_policy: always
     environment:
       - PUID=1000
       - PGID=1000
@@ -58,10 +61,11 @@ services:
       - /data/usenet/downloads:/downloads
     ports:
       - 8989:8989
-    restart: always
+    restart: unless-stopped
   radarr:
     image: lscr.io/linuxserver/radarr:latest
     container_name: radarr
+    pull_policy: always
     environment:
       - PUID=1000
       - PGID=1000
@@ -75,25 +79,11 @@ services:
       - /data/usenet/downloads:/downloads
     ports:
       - 7878:7878
-    restart: always
-  lidarr:
-    image: lscr.io/linuxserver/lidarr:latest
-    container_name: lidarr
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - UMASK=022
-      - TZ=America/New_York
-    volumes:
-      - /docker/config/lidarr:/config
-      - /mnt/share/media/music:/music
-      - /data/usenet/downloads:/downloads
-    ports:
-      - 8686:8686
-    restart: always
+    restart: unless-stopped
   prowlarr:
     image: lscr.io/linuxserver/prowlarr:latest
     container_name: prowlarr
+    pull_policy: always
     environment:
       - PUID=1000
       - PGID=1000
@@ -103,7 +93,21 @@ services:
     ports:
       - 9696:9696
     restart: unless-stopped
+  tautulli:
+    image: lscr.io/linuxserver/tautulli:latest
+    container_name: tautulli
+    pull_policy: always
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=America/New_York
+    volumes:
+      - tautulli:/config
+    ports:
+      - 8181:8181
+    restart: unless-stopped
 
 volumes:
   gluetun_data:
   sabnzbd_data:
+  tautulli:
diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml
new file mode 100644
index 0000000..d3d7070
--- /dev/null
+++ b/vaultwarden/docker-compose.yml
@@ -0,0 +1,21 @@
+version: "3"
+services:
+  vaultwarden:
+    image: vaultwarden/server:latest
+    container_name: vaultwarden
+    ports:
+      - 95:80
+#      - 5443:443
+    volumes:
+      - vaultwarden_data:/data
+    environment:
+      - WEBSOCKET_ENABLED="true"  # Enable WebSocket notifications
+      - ADMIN_TOKEN="bbhRvE7M/cZJ2b2bO5pC24z0gbdjpF7svlTWAAkDEm3sQ8WrVOjKZXePQ0JPlYLs"
+      - DOMAIN="https://pw.peterwood.rocks"
+      - ROCKET_PORT="80"
+      - ROCKET_PROFILE="release"
+# need more environment variables here
+    restart: always
+
+volumes:
+  vaultwarden_data: