From b0399e8757bebf6ce3dacf36e1c8665d84077a43 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Fri, 22 Oct 2021 14:16:48 +0200
Subject: [PATCH] fix(jdownloader and pihole): fix discrepancies between
 values.yaml and questions.yaml

---
 charts/stable/jdownloader2/Chart.yaml     | 3 +--
 charts/stable/jdownloader2/questions.yaml | 2 +-
 charts/stable/jdownloader2/values.yaml    | 3 +--
 charts/stable/pihole/Chart.yaml           | 3 +--
 charts/stable/pihole/values.yaml          | 2 +-
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/charts/stable/jdownloader2/Chart.yaml b/charts/stable/jdownloader2/Chart.yaml
index fcb48b1ce38..ba629f754aa 100644
--- a/charts/stable/jdownloader2/Chart.yaml
+++ b/charts/stable/jdownloader2/Chart.yaml
@@ -23,10 +23,9 @@ sources:
 - https://hub.docker.com/r/jlesage/jdownloader-2
 - https://jdownloader.org/
 type: application
-version: 3.0.16
+version: 3.0.17
 annotations:
   truecharts.org/catagories: |
     - downloads
-
   truecharts.org/SCALE-support: "true"
   truecharts.org/grade: U
diff --git a/charts/stable/jdownloader2/questions.yaml b/charts/stable/jdownloader2/questions.yaml
index 38f929c61c7..58955d17e47 100644
--- a/charts/stable/jdownloader2/questions.yaml
+++ b/charts/stable/jdownloader2/questions.yaml
@@ -449,7 +449,7 @@ questions:
     schema:
       type: dict
       attrs:
-        - variable: data
+        - variable: config
           label: "App Config Storage"
           description: "Stores the Application Configuration."
           schema:
diff --git a/charts/stable/jdownloader2/values.yaml b/charts/stable/jdownloader2/values.yaml
index 06dd598e50b..dfedf718178 100644
--- a/charts/stable/jdownloader2/values.yaml
+++ b/charts/stable/jdownloader2/values.yaml
@@ -36,7 +36,6 @@ envTpl:
 env:
   # Permissions Settings
   PUID: 568
-
   # General Settings
   KEEP_APP_RUNNING: "0"
   CLEAN_TMP_DIR: "1"
@@ -44,7 +43,7 @@ env:
   DISPLAY_WIDTH: "1280"
   DISPLAY_HEIGHT: "768"
   SECURE_CONNECTION: "0"
-  VNC_PASSWORD:
+  VNC_PASSWORD: ""
 
 persistence:
   config:
diff --git a/charts/stable/pihole/Chart.yaml b/charts/stable/pihole/Chart.yaml
index 117de6bb1b8..51d8630f7f8 100644
--- a/charts/stable/pihole/Chart.yaml
+++ b/charts/stable/pihole/Chart.yaml
@@ -21,10 +21,9 @@ sources:
 - https://github.com/pi-hole
 - https://github.com/pi-hole/docker-pi-hole
 type: application
-version: 3.0.17
+version: 3.0.18
 annotations:
   truecharts.org/catagories: |
     - networking
-
   truecharts.org/SCALE-support: "true"
   truecharts.org/grade: U
diff --git a/charts/stable/pihole/values.yaml b/charts/stable/pihole/values.yaml
index 1191cba8132..3210654c555 100644
--- a/charts/stable/pihole/values.yaml
+++ b/charts/stable/pihole/values.yaml
@@ -27,7 +27,7 @@ service:
   dns-tcp:
     enabled: true
     ports:
-      https:
+      dns-tcp:
         enabled: true
         port: 53
   dns: