From b86dec624f4900624a78888a1cdfaa41a9d4281b Mon Sep 17 00:00:00 2001
From: Michael Thomson <michael@michaelthomson.dev>
Date: Wed, 2 Oct 2024 16:11:35 -0400
Subject: [PATCH] Revert "gluetun again"

This reverts commit 2cd3882b49012ec618164db99b6265e364002ebd.
---
 media/qbittorrent/deployment.yaml       | 13 +++++++++----
 media/qbittorrent/gluetun-config.yaml   | 11 -----------
 media/qbittorrent/wireguard-config.yaml | 11 +++++++++++
 3 files changed, 20 insertions(+), 15 deletions(-)
 delete mode 100644 media/qbittorrent/gluetun-config.yaml
 create mode 100644 media/qbittorrent/wireguard-config.yaml

diff --git a/media/qbittorrent/deployment.yaml b/media/qbittorrent/deployment.yaml
index 58512ca..97db8fa 100644
--- a/media/qbittorrent/deployment.yaml
+++ b/media/qbittorrent/deployment.yaml
@@ -33,18 +33,20 @@ spec:
         - name: data
           mountPath: /data/downloads
           subPath: downloads
-      - name: gluetun
-        image: qmcgaw/gluetun
+      - name: wireguard
+        image: lscr.io/linuxserver/wireguard:latest
         envFrom:
         - configMapRef:
-            name: gluetun-config
+            name: wireguard-config
         securityContext:
           capabilities:
             add:
             - NET_ADMIN
         volumeMounts:
         - name: wireguard-config-secret
-          mountPath: /gluetun/wireguard
+          mountPath: /config/wg_confs
+        - name: wireguard-config
+          mountPath: /config
       volumes:
       - name: qbittorrent-config
         persistentVolumeClaim:
@@ -52,6 +54,9 @@ spec:
       - name: data
         persistentVolumeClaim:
           claimName: media-data
+      - name: wireguard-config
+        persistentVolumeClaim:
+          claimName: wireguard-config
       - name: wireguard-config-secret
         secret:
           secretName: wireguard-config-secret
diff --git a/media/qbittorrent/gluetun-config.yaml b/media/qbittorrent/gluetun-config.yaml
deleted file mode 100644
index 9dd1a98..0000000
--- a/media/qbittorrent/gluetun-config.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: gluetun-config
-  namespace: media
-data:
-  VPN_SERVICE_PROVIDER: custom
-  VPN_TYPE: wireguard
-  VPN_PORT_FORWARDING: on
-  VPN_PORT_FORWARDING_PROVIDER: protonvpn
-  UPDATER_PERIOD: 24h
diff --git a/media/qbittorrent/wireguard-config.yaml b/media/qbittorrent/wireguard-config.yaml
new file mode 100644
index 0000000..d8dfbfd
--- /dev/null
+++ b/media/qbittorrent/wireguard-config.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: wireguard-config
+  namespace: media
+data:
+  PUID: "1000"
+  GUID: "1000"
+  TZ: America/Toronto
+  DOCKER_MODS: linuxserver/mods:universal-package-install
+  INSTALL_PACKAGES: libnatpmp