From c20dc37d3cf29073c333806aba66362b51c4c65c Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Fri, 5 Jan 2024 23:42:55 +0200
Subject: [PATCH] fix(joplin): update mailer sec variable name (#16883)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Description**
<!--
Please include a summary of the change and which issue is fixed. Please
also include relevant motivation and context. List any dependencies that
are required for this change.
-->
⚒️ Fixes  #16874

**⚙️ 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>
---
 charts/stable/joplin-server/Chart.yaml     |  2 +-
 charts/stable/joplin-server/questions.yaml | 14 +++++++++++---
 charts/stable/joplin-server/values.yaml    |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/charts/stable/joplin-server/Chart.yaml b/charts/stable/joplin-server/Chart.yaml
index 25a4908bb57..413a267570f 100644
--- a/charts/stable/joplin-server/Chart.yaml
+++ b/charts/stable/joplin-server/Chart.yaml
@@ -1,7 +1,7 @@
 kubeVersion: ">=1.24.0-0"
 apiVersion: v2
 name: joplin-server
-version: 16.1.5
+version: 16.2.0
 appVersion: 2.14.1
 description: Allows you to sync any Joplin client.
 home: https://truecharts.org/charts/stable/joplin-server
diff --git a/charts/stable/joplin-server/questions.yaml b/charts/stable/joplin-server/questions.yaml
index 55b727028c8..fe50b9c0638 100644
--- a/charts/stable/joplin-server/questions.yaml
+++ b/charts/stable/joplin-server/questions.yaml
@@ -45,13 +45,21 @@ questions:
                                           show_if: [["MAILER_ENABLED", "=", 1]]
                                           type: int
                                           default: 465
-                                      - variable: MAILER_SECURE
+                                      - variable: tls
                                         label: Mailer Secure
                                         description: Enable SSL for SMTP
                                         schema:
                                           show_if: [["MAILER_ENABLED", "=", 1]]
-                                          type: boolean
-                                          default: true
+                                          type: string
+                                          default: tls
+                                          enum:
+                                            - value: tls
+                                              description: TLS
+                                            - value: starttls
+                                              description: StartTLS
+                                            - value: "none"
+                                              description: "None"
+
                                       - variable: MAILER_AUTH_USER
                                         label: Mailer Auth User
                                         description: Sets the username for the email server
diff --git a/charts/stable/joplin-server/values.yaml b/charts/stable/joplin-server/values.yaml
index 16aa2c5b5cd..c8db02a585e 100644
--- a/charts/stable/joplin-server/values.yaml
+++ b/charts/stable/joplin-server/values.yaml
@@ -45,7 +45,7 @@ workload:
             MAILER_ENABLED: 0
             MAILER_HOST: ""
             MAILER_PORT: 465
-            MAILER_SECURE: true
+            MAILER_SECURITY: tls
             MAILER_AUTH_USER: ""
             MAILER_AUTH_PASSWORD: ""
             MAILER_NOREPLY_NAME: ""