From 8fd9bf34f1f97d211e9f5a96af4ce59241a97ae0 Mon Sep 17 00:00:00 2001
From: David Young <davidy@funkypenguin.co.nz>
Date: Sun, 17 Nov 2024 09:45:31 +1300
Subject: [PATCH] try alternate gluetun/mediaflowproxy implementation

Signed-off-by: David Young <davidy@funkypenguin.co.nz>
---
 .../configmap-mediaflow-proxy-env.yaml        |  1 +
 .../sealed-secret-mediaflowproxy-env.yaml     | 27 -------------------
 charts/myprecious/values.yaml                 |  5 ++--
 3 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 charts/myprecious/templates/sealed-secrets/sealed-secret-mediaflowproxy-env.yaml

diff --git a/charts/myprecious/templates/configmaps/configmap-mediaflow-proxy-env.yaml b/charts/myprecious/templates/configmaps/configmap-mediaflow-proxy-env.yaml
index 9620521c8..ea2543b2b 100644
--- a/charts/myprecious/templates/configmaps/configmap-mediaflow-proxy-env.yaml
+++ b/charts/myprecious/templates/configmaps/configmap-mediaflow-proxy-env.yaml
@@ -5,6 +5,7 @@ metadata:
   name: mediaflow-proxy-env
 data:
   API_PASSWORD: "{{ .Values.mediaflowproxy.API_PASSWORD | default }}"
+  PROXY_URL: http://mediafusion:8888 # proxy via mediafusion's existing gluetun instance
   TRANSPORT_ROUTES: |
     {
       "https://*.alldebrid.com": {
diff --git a/charts/myprecious/templates/sealed-secrets/sealed-secret-mediaflowproxy-env.yaml b/charts/myprecious/templates/sealed-secrets/sealed-secret-mediaflowproxy-env.yaml
deleted file mode 100644
index 3dfbd8577..000000000
--- a/charts/myprecious/templates/sealed-secrets/sealed-secret-mediaflowproxy-env.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-{{ if .Values.mediaflowproxy.enabled }}
-{
-  "kind": "SealedSecret",
-  "apiVersion": "bitnami.com/v1alpha1",
-  "metadata": {
-    "name": "mediaflowproxy-env",
-    "creationTimestamp": null,
-    "annotations": {
-      "sealedsecrets.bitnami.com/cluster-wide": "true"
-    }
-  },
-  "spec": {
-    "template": {
-      "metadata": {
-        "name": "mediaflowproxy-env",
-        "creationTimestamp": null,
-        "annotations": {
-          "sealedsecrets.bitnami.com/cluster-wide": "true"
-        }
-      }
-    },
-    "encryptedData": {
-      "PROXY_URL": "AgAzG/uTmhEvjrwQOts+qy2TOI+ixC9ncJ0XDXIo1R/4/cA6tUvYg0L4HZ29n5uPjjkJfNOlRl79W/YNrN/76UNuZieYQJus3Hto2wC2xZT6w4VbRR5T48ZmYh8F+73DJMq9KLrl9ep3JFZq+/51oiI50aHZPZzyhFIgEG+xM2NAfe98+l3pK6eZbrqMJFKTywDzYnGiL5mWBVb1fXLbQmJqlEJFPycqKotwj6In9L/AhRWV0F/dnaMP4ONrs5of3fgpbuHJIqu9WLmH4QHZGqyH+H2OIzJBBhXkUBHhOZZXvip2H9ZLybtQUMbb6dyEJs2nXSRiPIy5czdiq1wj6b1TqZWafl/vkJuXHqUVLjSjk+OtJD5q73B1DNUqdg2KtEKkA1cd+7T5fI+nnxgVqmus7T3wrTxovDYnlbpoauz1WnYK+8nG3NinXPUbNbyLyb+UFmiChmwOzSYFOoa3slzTjOETKTKz4Jjpiuc88WgdAUTHuHTgfCWfDuwWOj4j5XVhLW4/DZsMZBR5IcyCjNnuY3iKIVXOxO6iZE73dolknHwJw57nnstwuaUK2N5MceXGuz3ndxiHC7lP4UtLL0LGBcRSGMyogFygA2IOJQCcMw9mkBVRPr/DV5gs6hnSBqkIkg4RhetHfwhQjt6RkE6yKYwvnZyQHCMfonl1q3SVAAWMrZHYgJHYvuUWEvi130J9r1mQU9YbRsl+G5oR3P2RMuRAs/c+97k4jL5z0IottW3odNeOyi10iu875TvYsWky"
-    }
-  }
-}
-{{ end }}
\ No newline at end of file
diff --git a/charts/myprecious/values.yaml b/charts/myprecious/values.yaml
index 4a721a275..baa254033 100644
--- a/charts/myprecious/values.yaml
+++ b/charts/myprecious/values.yaml
@@ -11090,6 +11090,7 @@ mediafusion:
         PORT_PERSIST: "1"
         NFTABLES: "1"
         VPNDNS: "0"
+        HTTPPROXY: "on" # we use this for mediaflowproxy
       envFrom:
       - secretRef:
           name: mediafusion-vpn
@@ -11170,9 +11171,7 @@ mediaflowproxy:
       name: mediaflow-proxy-env
   - configMapRef:
       name: elfbot-mediaflow-proxy
-      optional: true
-  - secretRef:
-      name: mediaflowproxy-env      
+      optional: true   
 
 stremiojackettcommunity: &stremiojackettcommunity
   enabled: false