From 5b7f274a94da03abbd60d80d9fc45737c1e33a6b Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Thu, 15 Apr 2021 23:49:05 +0200 Subject: [PATCH] Ingress GUI rework (#364) * Add common part of ingress changes * jackett demo gui * Port new IngressUI to all Apps --- .tools/tests/charts/common-test_spec.rb | 22 +-- dev/phpmyadmin/1.1.1/questions.yaml | 146 +++++++++--------- incubator/bazarr/3.1.1/questions.yaml | 148 +++++++++--------- incubator/calibre-web/3.1.1/questions.yaml | 148 +++++++++--------- incubator/deluge/3.1.1/questions.yaml | 146 +++++++++--------- incubator/freshrss/3.1.1/questions.yaml | 148 +++++++++--------- incubator/gaps/3.1.1/questions.yaml | 148 +++++++++--------- incubator/grocy/3.1.1/questions.yaml | 148 +++++++++--------- incubator/heimdall/3.1.1/questions.yaml | 148 +++++++++--------- incubator/lazylibrarian/3.1.1/questions.yaml | 148 +++++++++--------- incubator/lychee/3.1.1/questions.yaml | 148 +++++++++--------- incubator/navidrome/3.1.1/questions.yaml | 148 +++++++++--------- incubator/node-red/3.1.1/questions.yaml | 148 +++++++++--------- incubator/nzbget/3.1.1/questions.yaml | 148 +++++++++--------- incubator/nzbhydra/3.1.1/questions.yaml | 148 +++++++++--------- incubator/organizr/3.1.1/questions.yaml | 148 +++++++++--------- incubator/qbittorrent/3.1.1/questions.yaml | 148 +++++++++--------- incubator/readarr/3.1.1/questions.yaml | 148 +++++++++--------- incubator/sabnzbd/3.1.1/questions.yaml | 148 +++++++++--------- incubator/truecommand/3.1.1/questions.yaml | 148 +++++++++--------- incubator/tvheadend/4.1.1/questions.yaml | 148 +++++++++--------- incubator/unifi/3.1.1/questions.yaml | 148 +++++++++--------- library/common-test/Chart.yaml | 2 +- library/common-test/ci/default-values.yaml | 2 +- library/common-test/values.yaml | 2 +- library/common/Chart.yaml | 2 +- library/common/templates/_ingress.tpl | 10 +- stable/bitwarden/1.1.1/questions.yaml | 35 +++-- stable/collabora-online/3.1.1/questions.yaml | 149 +++++++++---------- stable/emby/3.1.1/questions.yaml | 148 +++++++++--------- stable/esphome/3.1.1/questions.yaml | 148 +++++++++--------- stable/handbrake/3.1.1/questions.yaml | 149 +++++++++---------- stable/home-assistant/3.1.1/questions.yaml | 146 +++++++++--------- stable/jackett/3.1.1/questions.yaml | 146 +++++++++--------- stable/jellyfin/3.1.1/questions.yaml | 148 +++++++++--------- stable/lidarr/3.1.1/questions.yaml | 148 +++++++++--------- stable/ombi/3.1.1/questions.yaml | 148 +++++++++--------- stable/radarr/3.1.1/questions.yaml | 148 +++++++++--------- stable/sonarr/3.1.1/questions.yaml | 148 +++++++++--------- stable/syncthing/3.1.1/questions.yaml | 148 +++++++++--------- stable/tautulli/3.1.1/questions.yaml | 148 +++++++++--------- stable/transmission/3.1.1/questions.yaml | 148 +++++++++--------- stable/zwavejs2mqtt/3.1.1/questions.yaml | 148 +++++++++--------- 43 files changed, 2663 insertions(+), 2734 deletions(-) diff --git a/.tools/tests/charts/common-test_spec.rb b/.tools/tests/charts/common-test_spec.rb index d4487e491f4..de73cfaeace 100644 --- a/.tools/tests/charts/common-test_spec.rb +++ b/.tools/tests/charts/common-test_spec.rb @@ -494,14 +494,14 @@ class Test < ChartTest end describe 'ingress' do - it 'should be disabled when (additional)ingress enabled = false' do + it 'should be disabled when (additional)ingress enabled = false and certType = disabled' do values = { ingress: { test1: { enabled: false }, test2: { - enabled: false + certType: "disabled" } }, additionalIngress: [ @@ -526,7 +526,7 @@ class Test < ChartTest enabled: true }, test2: { - enabled: true + certType: "plain" } }, additionalIngress: [ @@ -551,7 +551,7 @@ class Test < ChartTest enabled: true }, test2: { - enabled: true + certType: "plain" } }, additionalIngress: [ @@ -577,7 +577,7 @@ class Test < ChartTest enabled: false }, test2: { - enabled: true + certType: "plain" } }, additionalIngress: [ @@ -649,7 +649,7 @@ class Test < ChartTest type: "HTTP" }, test2: { - enabled: false + certType: "disabled" } }, additionalIngress: [ @@ -706,7 +706,7 @@ class Test < ChartTest type: "TCP" }, test2: { - enabled: false + certType: "disabled" } }, additionalIngress: [ @@ -733,7 +733,7 @@ class Test < ChartTest type: "UDP" }, test2: { - enabled: false + certType: "disabled" } }, additionalIngress: [ @@ -759,7 +759,7 @@ class Test < ChartTest enabled: false }, test2: { - enabled: false + certType: "disabled" } }, additionalIngress: [ @@ -786,7 +786,7 @@ class Test < ChartTest enabled: false }, test2: { - enabled: false + certType: "disabled" } }, additionalIngress: { @@ -845,7 +845,7 @@ class Test < ChartTest type: "UDP" }, test2: { - enabled: false, + certType: "disabled", type: "TCP" }, test2b: { diff --git a/dev/phpmyadmin/1.1.1/questions.yaml b/dev/phpmyadmin/1.1.1/questions.yaml index 134cddebd84..011883303e7 100644 --- a/dev/phpmyadmin/1.1.1/questions.yaml +++ b/dev/phpmyadmin/1.1.1/questions.yaml @@ -238,84 +238,82 @@ questions: schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: UMASK group: "Advanced" diff --git a/incubator/bazarr/3.1.1/questions.yaml b/incubator/bazarr/3.1.1/questions.yaml index e071b6c1d85..1bd1cd10cb2 100644 --- a/incubator/bazarr/3.1.1/questions.yaml +++ b/incubator/bazarr/3.1.1/questions.yaml @@ -282,88 +282,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: UMASK group: "Advanced" diff --git a/incubator/calibre-web/3.1.1/questions.yaml b/incubator/calibre-web/3.1.1/questions.yaml index 1b76d4c78b0..53692d8c0d4 100644 --- a/incubator/calibre-web/3.1.1/questions.yaml +++ b/incubator/calibre-web/3.1.1/questions.yaml @@ -281,88 +281,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: PUID group: "Advanced" label: "PUID" diff --git a/incubator/deluge/3.1.1/questions.yaml b/incubator/deluge/3.1.1/questions.yaml index 7240e7b0e1b..11c7912d8e9 100644 --- a/incubator/deluge/3.1.1/questions.yaml +++ b/incubator/deluge/3.1.1/questions.yaml @@ -407,84 +407,82 @@ questions: schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: PUID group: "Advanced" label: "PUID" diff --git a/incubator/freshrss/3.1.1/questions.yaml b/incubator/freshrss/3.1.1/questions.yaml index 831016a995d..26076e36b8e 100644 --- a/incubator/freshrss/3.1.1/questions.yaml +++ b/incubator/freshrss/3.1.1/questions.yaml @@ -283,88 +283,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: PUID group: "Advanced" label: "PUID" diff --git a/incubator/gaps/3.1.1/questions.yaml b/incubator/gaps/3.1.1/questions.yaml index 196a71297d0..325745b06a5 100644 --- a/incubator/gaps/3.1.1/questions.yaml +++ b/incubator/gaps/3.1.1/questions.yaml @@ -283,88 +283,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: UMASK group: "Advanced" diff --git a/incubator/grocy/3.1.1/questions.yaml b/incubator/grocy/3.1.1/questions.yaml index b8731e2ee16..c29263e6edf 100644 --- a/incubator/grocy/3.1.1/questions.yaml +++ b/incubator/grocy/3.1.1/questions.yaml @@ -281,88 +281,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: PUID group: "Advanced" label: "PUID" diff --git a/incubator/heimdall/3.1.1/questions.yaml b/incubator/heimdall/3.1.1/questions.yaml index 545116fb65c..73afe0adbb6 100644 --- a/incubator/heimdall/3.1.1/questions.yaml +++ b/incubator/heimdall/3.1.1/questions.yaml @@ -282,88 +282,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: PUID group: "Advanced" label: "PUID" diff --git a/incubator/lazylibrarian/3.1.1/questions.yaml b/incubator/lazylibrarian/3.1.1/questions.yaml index 7908557c9d5..8db350d3209 100644 --- a/incubator/lazylibrarian/3.1.1/questions.yaml +++ b/incubator/lazylibrarian/3.1.1/questions.yaml @@ -283,88 +283,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: PUID group: "Advanced" label: "PUID" diff --git a/incubator/lychee/3.1.1/questions.yaml b/incubator/lychee/3.1.1/questions.yaml index 545116fb65c..73afe0adbb6 100644 --- a/incubator/lychee/3.1.1/questions.yaml +++ b/incubator/lychee/3.1.1/questions.yaml @@ -282,88 +282,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: PUID group: "Advanced" label: "PUID" diff --git a/incubator/navidrome/3.1.1/questions.yaml b/incubator/navidrome/3.1.1/questions.yaml index e198a015d4d..ac69296919c 100644 --- a/incubator/navidrome/3.1.1/questions.yaml +++ b/incubator/navidrome/3.1.1/questions.yaml @@ -282,88 +282,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: UMASK group: "Advanced" diff --git a/incubator/node-red/3.1.1/questions.yaml b/incubator/node-red/3.1.1/questions.yaml index 9186caf2274..59e55ba4af7 100644 --- a/incubator/node-red/3.1.1/questions.yaml +++ b/incubator/node-red/3.1.1/questions.yaml @@ -282,88 +282,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: UMASK group: "Advanced" diff --git a/incubator/nzbget/3.1.1/questions.yaml b/incubator/nzbget/3.1.1/questions.yaml index da876e3ab38..d6524430072 100644 --- a/incubator/nzbget/3.1.1/questions.yaml +++ b/incubator/nzbget/3.1.1/questions.yaml @@ -282,88 +282,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: UMASK group: "Advanced" diff --git a/incubator/nzbhydra/3.1.1/questions.yaml b/incubator/nzbhydra/3.1.1/questions.yaml index 7c9eb3bdf10..0cd2a570cea 100644 --- a/incubator/nzbhydra/3.1.1/questions.yaml +++ b/incubator/nzbhydra/3.1.1/questions.yaml @@ -282,88 +282,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: UMASK group: "Advanced" diff --git a/incubator/organizr/3.1.1/questions.yaml b/incubator/organizr/3.1.1/questions.yaml index fefeca879c2..16b7b32d37f 100644 --- a/incubator/organizr/3.1.1/questions.yaml +++ b/incubator/organizr/3.1.1/questions.yaml @@ -334,88 +334,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: PUID group: "Advanced" label: "PUID" diff --git a/incubator/qbittorrent/3.1.1/questions.yaml b/incubator/qbittorrent/3.1.1/questions.yaml index 3009b1dd482..01ccc0ea9b4 100644 --- a/incubator/qbittorrent/3.1.1/questions.yaml +++ b/incubator/qbittorrent/3.1.1/questions.yaml @@ -409,88 +409,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: UMASK group: "Advanced" diff --git a/incubator/readarr/3.1.1/questions.yaml b/incubator/readarr/3.1.1/questions.yaml index 2bef56c30a6..169264473ca 100644 --- a/incubator/readarr/3.1.1/questions.yaml +++ b/incubator/readarr/3.1.1/questions.yaml @@ -282,88 +282,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: UMASK group: "Advanced" diff --git a/incubator/sabnzbd/3.1.1/questions.yaml b/incubator/sabnzbd/3.1.1/questions.yaml index c60ba64a247..296e35e271f 100644 --- a/incubator/sabnzbd/3.1.1/questions.yaml +++ b/incubator/sabnzbd/3.1.1/questions.yaml @@ -298,88 +298,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: UMASK group: "Advanced" diff --git a/incubator/truecommand/3.1.1/questions.yaml b/incubator/truecommand/3.1.1/questions.yaml index e64aee8d561..dd76530be34 100644 --- a/incubator/truecommand/3.1.1/questions.yaml +++ b/incubator/truecommand/3.1.1/questions.yaml @@ -284,88 +284,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: PUID group: "Advanced" diff --git a/incubator/tvheadend/4.1.1/questions.yaml b/incubator/tvheadend/4.1.1/questions.yaml index 6d0f7fe36b4..43e97c25e75 100644 --- a/incubator/tvheadend/4.1.1/questions.yaml +++ b/incubator/tvheadend/4.1.1/questions.yaml @@ -324,88 +324,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: PUID group: "Advanced" label: "PUID" diff --git a/incubator/unifi/3.1.1/questions.yaml b/incubator/unifi/3.1.1/questions.yaml index d7aa637f1f8..7f4ae79bbb6 100644 --- a/incubator/unifi/3.1.1/questions.yaml +++ b/incubator/unifi/3.1.1/questions.yaml @@ -409,88 +409,86 @@ questions: type: dict attrs: - variable: main - label: "Web Ingress Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: tcp label: "TCP Ingress Configuration" schema: diff --git a/library/common-test/Chart.yaml b/library/common-test/Chart.yaml index 1a4193aee95..b6efdb0f3e3 100644 --- a/library/common-test/Chart.yaml +++ b/library/common-test/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: common-test -version: 2.1.4 +version: 2.1.5 # upstream_version: appVersion: none description: Helper chart to test different use cases of the common library diff --git a/library/common-test/ci/default-values.yaml b/library/common-test/ci/default-values.yaml index f50014a9eea..6b1af5119ed 100644 --- a/library/common-test/ci/default-values.yaml +++ b/library/common-test/ci/default-values.yaml @@ -48,7 +48,7 @@ ingress: test1: enabled: true test2: - enabled: true + certType: "plain" additionalIngress: - name: "test3" diff --git a/library/common-test/values.yaml b/library/common-test/values.yaml index ba0f2451a9f..a863655ece4 100644 --- a/library/common-test/values.yaml +++ b/library/common-test/values.yaml @@ -46,7 +46,7 @@ ingress: test1: enabled: true test2: - enabled: true + certType: "plain" additionalIngress: - name: "test3" diff --git a/library/common/Chart.yaml b/library/common/Chart.yaml index d263c56bd0e..2b8145c6006 100644 --- a/library/common/Chart.yaml +++ b/library/common/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: common -version: 3.5.1 +version: 3.5.2 # upstream_version: appVersion: none description: Function library for TrueCharts diff --git a/library/common/templates/_ingress.tpl b/library/common/templates/_ingress.tpl index 846043750d7..4189ad1a77b 100644 --- a/library/common/templates/_ingress.tpl +++ b/library/common/templates/_ingress.tpl @@ -5,7 +5,9 @@ of the main Ingress and any additionalIngresses. {{- define "common.ingress" -}} {{- /* Generate named ingresses as required */ -}} {{- range $name, $ingress := .Values.ingress }} - {{- if $ingress.enabled -}} + {{- $certType := $ingress.certType | default "disabled" -}} + {{- $enabled := $ingress.enabled | default false -}} + {{- if or ( ne $certType "disabled" ) ( $ingress.enabled ) -}} {{- print ("---") | nindent 0 -}} {{- $ingressValues := $ingress -}} @@ -44,7 +46,8 @@ of the main Ingress and any additionalIngresses. {{- /* Generate additional ingresses as required */ -}} {{- range $index, $additionalIngress := .Values.additionalIngress }} - {{- if $additionalIngress.enabled -}} + {{- $certType := $additionalIngress.certType | default "disabled" -}} + {{- if or ( ne $certType "disabled" ) ( $additionalIngress.enabled ) -}} {{- print ("---") | nindent 0 -}} {{- $ingressValues := $additionalIngress -}} @@ -86,7 +89,8 @@ of the main Ingress and any additionalIngresses. {{- /* Generate externalService ingresses as required */ -}} {{- range $index, $externalService := .Values.externalServices }} - {{- if $externalService.enabled -}} + {{- $certType := $externalService.certType | default "disabled" -}} + {{- if or ( ne $certType "disabled" ) ( $externalService.enabled ) -}} {{- print ("---") | nindent 0 -}} {{- $ingressValues := $externalService -}} diff --git a/stable/bitwarden/1.1.1/questions.yaml b/stable/bitwarden/1.1.1/questions.yaml index 4ed9e1bcb8e..69fb087bb10 100644 --- a/stable/bitwarden/1.1.1/questions.yaml +++ b/stable/bitwarden/1.1.1/questions.yaml @@ -753,16 +753,24 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: true - hidden: true + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" - variable: type label: "Reverse Proxy Type" schema: @@ -781,6 +789,7 @@ questions: - variable: entrypoint label: "Select Entrypoint" schema: + show_if: [["certType", "!=", "disabled"]] type: string default: "websecure" required: true @@ -790,6 +799,7 @@ questions: - variable: hosts label: "Hosts" schema: + show_if: [["certType", "!=", "disabled"]] type: list default: [] items: @@ -810,18 +820,6 @@ questions: required: true hidden: true default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - variable: certificate label: "Select TrueNAS SCALE Certificate" schema: @@ -832,6 +830,7 @@ questions: - variable: authForwardURL label: "Forward Authentication URL" schema: + show_if: [["certType", "!=", "disabled"]] type: string default: "" diff --git a/stable/collabora-online/3.1.1/questions.yaml b/stable/collabora-online/3.1.1/questions.yaml index 3fef57d6b7c..59f2a676ffe 100644 --- a/stable/collabora-online/3.1.1/questions.yaml +++ b/stable/collabora-online/3.1.1/questions.yaml @@ -271,86 +271,83 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" - group: "Reverse Proxy" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" diff --git a/stable/emby/3.1.1/questions.yaml b/stable/emby/3.1.1/questions.yaml index 1d0764614d3..6a9e4317b00 100644 --- a/stable/emby/3.1.1/questions.yaml +++ b/stable/emby/3.1.1/questions.yaml @@ -290,88 +290,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: UMASK group: "Advanced" diff --git a/stable/esphome/3.1.1/questions.yaml b/stable/esphome/3.1.1/questions.yaml index 35dd0a41f6c..235f6d9363f 100644 --- a/stable/esphome/3.1.1/questions.yaml +++ b/stable/esphome/3.1.1/questions.yaml @@ -332,88 +332,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" # Enable privileged - variable: securityContext group: "Advanced" diff --git a/stable/handbrake/3.1.1/questions.yaml b/stable/handbrake/3.1.1/questions.yaml index 8635f03a2d9..c189425dd00 100644 --- a/stable/handbrake/3.1.1/questions.yaml +++ b/stable/handbrake/3.1.1/questions.yaml @@ -444,89 +444,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" - group: "Reverse Proxy" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: PUID group: "Advanced" label: "PUID" diff --git a/stable/home-assistant/3.1.1/questions.yaml b/stable/home-assistant/3.1.1/questions.yaml index e140ca6d103..4798d72487a 100644 --- a/stable/home-assistant/3.1.1/questions.yaml +++ b/stable/home-assistant/3.1.1/questions.yaml @@ -335,84 +335,82 @@ questions: schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: PUID group: "Advanced" label: "PUID" diff --git a/stable/jackett/3.1.1/questions.yaml b/stable/jackett/3.1.1/questions.yaml index 1b300213f05..b6b4742452c 100644 --- a/stable/jackett/3.1.1/questions.yaml +++ b/stable/jackett/3.1.1/questions.yaml @@ -284,84 +284,82 @@ questions: schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: UMASK group: "Advanced" diff --git a/stable/jellyfin/3.1.1/questions.yaml b/stable/jellyfin/3.1.1/questions.yaml index 1d0764614d3..6a9e4317b00 100644 --- a/stable/jellyfin/3.1.1/questions.yaml +++ b/stable/jellyfin/3.1.1/questions.yaml @@ -290,88 +290,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: UMASK group: "Advanced" diff --git a/stable/lidarr/3.1.1/questions.yaml b/stable/lidarr/3.1.1/questions.yaml index da96bf84cbe..f7593f781db 100644 --- a/stable/lidarr/3.1.1/questions.yaml +++ b/stable/lidarr/3.1.1/questions.yaml @@ -281,88 +281,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: UMASK group: "Advanced" diff --git a/stable/ombi/3.1.1/questions.yaml b/stable/ombi/3.1.1/questions.yaml index 684127b893e..d7c79f9dec0 100644 --- a/stable/ombi/3.1.1/questions.yaml +++ b/stable/ombi/3.1.1/questions.yaml @@ -281,88 +281,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: UMASK group: "Advanced" diff --git a/stable/radarr/3.1.1/questions.yaml b/stable/radarr/3.1.1/questions.yaml index f92de84ec09..1d2a1559f6c 100644 --- a/stable/radarr/3.1.1/questions.yaml +++ b/stable/radarr/3.1.1/questions.yaml @@ -282,88 +282,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: authForwardURL label: "Forward Authentication URL" schema: diff --git a/stable/sonarr/3.1.1/questions.yaml b/stable/sonarr/3.1.1/questions.yaml index dd629208444..922c245d74c 100644 --- a/stable/sonarr/3.1.1/questions.yaml +++ b/stable/sonarr/3.1.1/questions.yaml @@ -282,88 +282,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: UMASK group: "Advanced" diff --git a/stable/syncthing/3.1.1/questions.yaml b/stable/syncthing/3.1.1/questions.yaml index c27c713f982..3e0ae3e5966 100644 --- a/stable/syncthing/3.1.1/questions.yaml +++ b/stable/syncthing/3.1.1/questions.yaml @@ -272,88 +272,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" # Enable privileged - variable: securityContext group: "Advanced" diff --git a/stable/tautulli/3.1.1/questions.yaml b/stable/tautulli/3.1.1/questions.yaml index c0e0dd0ddd5..e9f9c567a8d 100644 --- a/stable/tautulli/3.1.1/questions.yaml +++ b/stable/tautulli/3.1.1/questions.yaml @@ -282,88 +282,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: UMASK group: "Advanced" diff --git a/stable/transmission/3.1.1/questions.yaml b/stable/transmission/3.1.1/questions.yaml index c5249131276..29018f8c94f 100644 --- a/stable/transmission/3.1.1/questions.yaml +++ b/stable/transmission/3.1.1/questions.yaml @@ -590,88 +590,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" - variable: UMASK group: "Advanced" diff --git a/stable/zwavejs2mqtt/3.1.1/questions.yaml b/stable/zwavejs2mqtt/3.1.1/questions.yaml index e55e9d0aa4a..0368b708f64 100644 --- a/stable/zwavejs2mqtt/3.1.1/questions.yaml +++ b/stable/zwavejs2mqtt/3.1.1/questions.yaml @@ -359,88 +359,86 @@ questions: type: dict attrs: - variable: main - label: "Web Reverse Proxy Configuration" + label: "WebUI" schema: type: dict attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" + - variable: certType + label: "Select Reverse-Proxy Type" schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + type: string + default: "selfsigned" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" # Enable privileged - variable: securityContext group: "Advanced"