From 1e4e8318db23efae8781a68ddf98e96edc509be9 Mon Sep 17 00:00:00 2001
From: StevenMcElligott <89483932+StevenMcElligott@users.noreply.github.com>
Date: Sat, 20 Jan 2024 19:19:07 -0500
Subject: [PATCH] feat(ntfy): Add nfty_upstream_base_url env var (#17314)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Description**

Since I may want to you use this figure I may as well add it myself to
the defaults

⚒️ Fixes  #16919

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [ ] 🪛 Bugfix
- [ ] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] 🔃 Refactor of current code

**🧪 How Has This Been Tested?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ Checklist:**

- [ ] ⚖️ My code follows the style guidelines of this project
- [ ] 👀 I have performed a self-review of my own code
- [ ] #️⃣ I have commented my code, particularly in hard-to-understand
areas
- [ ] 📄 I have made corresponding changes to the documentation
- [ ] ⚠️ My changes generate no new warnings
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [ ] ⬆️ I increased versions for any altered app according to semantic
versioning

**➕ App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🪞 I have opened a PR on
[truecharts/containers](https://github.com/truecharts/containers) adding
the container to TrueCharts mirror repo.
- [ ] 🖼️ I have added an icon in the Chart's root directory called
`icon.png`

---

_Please don't blindly check all the boxes. Read them and only check
those that apply.
Those checkboxes are there for the reviewer to see what is this all
about and
the status of this PR with a quick glance._

---------

Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
---
 charts/stable/ntfy/Chart.yaml     | 2 +-
 charts/stable/ntfy/questions.yaml | 6 ++++++
 charts/stable/ntfy/values.yaml    | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/charts/stable/ntfy/Chart.yaml b/charts/stable/ntfy/Chart.yaml
index 3b5ba75c2eb..0c05d91137b 100644
--- a/charts/stable/ntfy/Chart.yaml
+++ b/charts/stable/ntfy/Chart.yaml
@@ -33,4 +33,4 @@ sources:
   - https://hub.docker.com/r/binwiederhier/ntfy
   - https://github.com/binwiederhier/ntfy/
 type: application
-version: 8.1.6
+version: 8.2.0
diff --git a/charts/stable/ntfy/questions.yaml b/charts/stable/ntfy/questions.yaml
index 10e42d1d6bc..d060bbc83dc 100644
--- a/charts/stable/ntfy/questions.yaml
+++ b/charts/stable/ntfy/questions.yaml
@@ -59,6 +59,12 @@ questions:
                                           type: string
                                           required: true
                                           default: "1m"
+                                      - variable: NTFY_UPSTREAM_BASE_URL
+                                        label: "Upstream Base URL"
+                                        description: "Needed for iOS Push Notifications"
+                                        schema:
+                                          type: string
+                                          default: "https://ntfy.sh"
                                       - variable: NTFY_GLOBAL_TOPIC_LIMIT
                                         label: "Global Topic Limit"
                                         description: "Rate limiting: Total number of topics before the server rejects new topics."
diff --git a/charts/stable/ntfy/values.yaml b/charts/stable/ntfy/values.yaml
index 0bd7f0f4c3f..184584787df 100644
--- a/charts/stable/ntfy/values.yaml
+++ b/charts/stable/ntfy/values.yaml
@@ -50,6 +50,7 @@ workload:
             ENABLE_ATTACHMENT_CACHE_DIR: false
             ENABLE_AUTH_FILE: false
             NTFY_ENABLE_METRICS: "{{ .Values.metrics.main.enabled }}"
+            NTFY_UPSTREAM_BASE_URL: "https://ntfy.sh"
             # NTFY_CACHE_DURATION: "12h"
             # NTFY_KEEPALIVE_INTERVAL: "45s"
             # NTFY_MANAGER_INTERVAL: "1m"