Bug fixes for domain/cert_domain env variables

test/collabora/1.0.0/questions.yaml

@@ -26,20 +26,20 @@ questions:
       type: dict
       attrs:
         - variable: timezone
-            label: "Timezone"
-            group: "Collabora Configuration"
-            schema:
-              type: string
-              $ref:
-                - "definitions/timezone"
+          label: "Timezone"
+          group: "Collabora Configuration"
+          schema:
+            type: string
+            $ref:
+              - "definitions/timezone"
         - variable: domain
-            label: "Domain(s) using collabora"
-            description: 'Use backslash "\" before dots ".". Use pipe "|" to separate multiple domains'
-            schema:
-              type: string
-              default: 'nextcloud\.domain\.tld|othernextcloud\.domain\.tld'
-              valid_chars: '^([a-z]{1,}\\{1}\.{1}[a-z]{1,}\\{1}\.{1}[a-z]{1,}\|{0,1})*$'
-              required: true
+          label: "Domain(s) using collabora"
+          description: 'Use backslash "\" before dots ".". Use pipe "|" to separate multiple domains'
+          schema:
+            type: string
+            default: 'nextcloud\.domain\.tld|othernextcloud\.domain\.tld'
+            # valid_chars: '^$|^([a-z]{1,}\\{1}\.{1}[a-z]{1,}\\{1}\.{1}[a-z]{1,}\|{0,1})*$'
+            required: false
         - variable: username
           label: "Username for WebUI"
           schema:
@@ -82,7 +82,7 @@ questions:
           schema:
             type: string
             default: ''
-            valid_chars: '^[a-z]{1,}\\{1}\.{1}[a-z]{1,}\\{1}\.{1}[a-z]{1,}$'
+            valid_chars: '^$|^[a-z]{1,}\\{1}\.{1}[a-z]{1,}\\{1}\.{1}[a-z]{1,}$'
 
   - variable: extraAppVolumeMounts
     label: "Collabora Extra Host Path Volumes"

test/collabora/1.0.0/templates/deployment.yaml

@@ -33,6 +33,7 @@ spec:
           {{ $envList = mustAppend $envList (dict "name" "timezone" "value" $envConfig.timezone) }}
           {{ $envList = mustAppend $envList (dict "name" "domain" "value" $envConfig.domain) }}
           {{ $envList = mustAppend $envList (dict "name" "dictionaries" "value" $envConfig.dictionaries) }}
+          {{ $envList = mustAppend $envList (dict "name" "cert_domain" "value" "192.168.0.3") }}
           {{ $envList = mustAppend $envList (dict "name" "extra_params" "value" $envConfig.extra_params) }}
           {{ $envList = mustAppend $envList (dict "name" "DONT_GEN_SSL_CERT" "value" $envConfig.DONT_GEN_SSL_CERT) }}
           {{ $envList = mustAppend $envList (dict "name" "server_name" "value" $envConfig.server_name) }}