From fa30f5308a91f3c93392f4a6ffda90648165253b Mon Sep 17 00:00:00 2001
From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com>
Date: Tue, 3 Oct 2023 18:05:20 -0400
Subject: [PATCH] fix(docassemble) fix docassemble env variables (#13211)
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  # <!--(issue)-->

**⚙️ 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._
---
 charts/incubator/docassemble/Chart.yaml     |  2 +-
 charts/incubator/docassemble/questions.yaml |  4 ++--
 charts/incubator/docassemble/values.yaml    | 12 +++++++++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/charts/incubator/docassemble/Chart.yaml b/charts/incubator/docassemble/Chart.yaml
index e98c47ea20b..697c2ced878 100644
--- a/charts/incubator/docassemble/Chart.yaml
+++ b/charts/incubator/docassemble/Chart.yaml
@@ -21,7 +21,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/docassemble
   - https://github.com/jhpyle/docassemble
 type: application
-version: 0.0.1
+version: 0.0.2
 annotations:
   truecharts.org/catagories: |
     - documentation
diff --git a/charts/incubator/docassemble/questions.yaml b/charts/incubator/docassemble/questions.yaml
index 129d024be4c..1c9bc02636c 100644
--- a/charts/incubator/docassemble/questions.yaml
+++ b/charts/incubator/docassemble/questions.yaml
@@ -27,8 +27,8 @@ questions:
             type: string
             required: true
             default: "http://localhost:10685"
-        - variable: https
-          label: https
+        - variable: behind_loadbalancer
+          label: Behind LoadBalancer
           schema:
             type: boolean
             default: false
diff --git a/charts/incubator/docassemble/values.yaml b/charts/incubator/docassemble/values.yaml
index 1780ab282b1..02ee44932f2 100644
--- a/charts/incubator/docassemble/values.yaml
+++ b/charts/incubator/docassemble/values.yaml
@@ -9,10 +9,16 @@ service:
       main:
         protocol: http
         port: 10685
+  rcon:
+    enabled: true
+    ports:
+      rcon:
+        enabled: true
+        port: 25575
 
 docassemble:
   hostname: docassemble.example.com
-  https: false
+  behind_loadbalancer: false
 
 workload:
   main:
@@ -40,8 +46,8 @@ workload:
               secretKeyRef:
                 name: cnpg-main-urls
                 key: host
-            DALISTENPORT: "{{ .Values.service.main.ports.main.port }}"
-            USEHTTPS: "{{ .Values.docassemble.https }}"
+            PORT: "{{ .Values.service.main.ports.main.port }}"
+            BEHINDHTTPSLOADBALANCER: "{{ .Values.docassemble.behind_loadbalancer }}"
             DAHOSTNAME: "{{ .Values.docassemble.hostname }}"
 
 persistence: