From 71650971bca2883b236aca036613e2b2ee095d04 Mon Sep 17 00:00:00 2001
From: Xstar97 <Xstar97@users.noreply.github.com>
Date: Tue, 17 Jan 2023 17:20:24 -0500
Subject: [PATCH] fix(valheim) added regex to server pass + clean up the gui
 (#6440)

* fix(valheim) set min length and fix labels

* remove password required
---
 charts/stable/valheim/Chart.yaml              |  2 +-
 .../stable/valheim/docs/installation_notes.md |  4 +--
 charts/stable/valheim/questions.yaml          | 32 +++++++++----------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/charts/stable/valheim/Chart.yaml b/charts/stable/valheim/Chart.yaml
index 5b0dd9f4386..4dac72e23d7 100644
--- a/charts/stable/valheim/Chart.yaml
+++ b/charts/stable/valheim/Chart.yaml
@@ -19,7 +19,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/valheim
   - https://github.com/lloesche/valheim-server-docker
   - https://hub.docker.com/r/lloesche/valheim-server
-version: 5.0.11
+version: 5.0.12
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/stable/valheim/docs/installation_notes.md b/charts/stable/valheim/docs/installation_notes.md
index 3fb61f50caa..85da03366bb 100644
--- a/charts/stable/valheim/docs/installation_notes.md
+++ b/charts/stable/valheim/docs/installation_notes.md
@@ -2,7 +2,7 @@
 
 Valheim app does not support having different port numbers for `port` and `targetPort`.
 Setting `port` will set the same port number to `targetPort` and it's Environmental Variable.
-e.g `STATUS_HTTP_PORT`, `SUPERVISOR_HTTP_PORT`, `SERVER_PORT`
+e.g `Status HTTP Port`, `Supervisor HTTP Port`, `Server Port`
 
 Also, services named `valheim1`, `valheim2`, `valheim3`, should be continuous port numbers. eg 2456, 2457, 2458.
-You can't skip a number!
+You **can't** skip a number!
diff --git a/charts/stable/valheim/questions.yaml b/charts/stable/valheim/questions.yaml
index 68800f45b89..396ebbf8840 100644
--- a/charts/stable/valheim/questions.yaml
+++ b/charts/stable/valheim/questions.yaml
@@ -21,25 +21,25 @@ questions:
       type: dict
       attrs:
         - variable: SUPERVISOR_HTTP_USER
-          label: SUPERVISOR_HTTP_USER
+          label: Supervisor HTTP User
           schema:
             type: string
             default: admin
             required: true
         - variable: SUPERVISOR_HTTP_PASS
-          label: SUPERVISOR_HTTP_PASS
+          label: Supervisor HTTP Pass
           schema:
             type: string
             required: true
             private: true
-            default: REPLACETHIS
+            default: ""
         - variable: SERVER_PASS
-          label: SERVER_PASS
+          label: Server Pass
           schema:
             type: string
-            required: true
             private: true
-            default: REPLACETHIS
+            default: ""
+            min_length: 5
   - variable: env
     group: App Configuration
     label: Image Environment
@@ -48,57 +48,57 @@ questions:
       type: dict
       attrs:
         - variable: STATUS_HTTP
-          label: STATUS_HTTP
+          label: Status HTTP
           schema:
             type: boolean
             default: true
         - variable: SUPERVISOR_HTTP
-          label: SUPERVISOR_HTTP
+          label: Supervisor HTTP
           schema:
             type: boolean
             default: true
         - variable: SERVER_NAME
-          label: SERVER_NAME
+          label: Server Name
           schema:
             type: string
             default: My Server
             required: true
         - variable: WORLD_NAME
-          label: WORLD_NAME
+          label: World Name
           schema:
             type: string
             default: Dedicated
             required: true
         - variable: SERVER_PUBLIC
-          label: SERVER_PUBLIC
+          label: Server Public
           schema:
             type: boolean
             default: true
         - variable: UPDATE_INTERVAL
-          label: UPDATE_INTERVAL
+          label: Update Interval
           schema:
             type: int
             default: 10800
             required: true
         - variable: BACKUPS
-          label: BACKUPS
+          label: Backups
           schema:
             type: boolean
             default: true
         - variable: BACKUPS_INTERVAL
-          label: BACKUPS_INTERVAL
+          label: Backups Interval
           schema:
             type: int
             default: 43200
             required: true
         - variable: BACKUPS_DIRECTORY
-          label: BACKUPS_DIRECTORY
+          label: Backups Directory
           schema:
             type: string
             default: /backups
             required: true
         - variable: BACKUPS_MAX_AGE
-          label: BACKUPS_MAX_AGE
+          label: Backups Max Age
           schema:
             type: int
             default: 3