Merge branch 'develop' into 'develop'

fix: empty array causes parse error on server start

Co-authored-by: corite <me@corite.dev>

See merge request firefish/firefish!10619
This commit is contained in:
Kainoa Kanter 2023-10-10 01:04:00 +00:00
commit 72570d67ec

View file

@ -217,8 +217,7 @@ id: 'aid'
#maxCaptionLength: 1500 #maxCaptionLength: 1500
# Reserved usernames that only the administrator can register with # Reserved usernames that only the administrator can register with
reservedUsernames: reservedUsernames: {{ .Values.firefish.reservedUsernames | toJson }}
{{ .Values.firefish.reservedUsernames | toYaml }}
# Whether disable HSTS # Whether disable HSTS
#disableHsts: true #disableHsts: true
@ -265,8 +264,7 @@ reservedUsernames:
# Proxy remote files (default: false) # Proxy remote files (default: false)
#proxyRemoteFiles: true #proxyRemoteFiles: true
allowedPrivateNetworks: allowedPrivateNetworks: {{ .Values.firefish.allowedPrivateNetworks | toJson }}
{{ .Values.firefish.allowedPrivateNetworks | toYaml }}
# TWA # TWA
#twa: #twa: