Commit c94dde22 authored by sonicaj's avatar sonicaj

Bug fixes for domain/cert_domain env variables

parent d5ad44ff
......@@ -38,8 +38,8 @@ questions:
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
# 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"
......
......@@ -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) }}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment