Merge branch 'master' into techknowlogick-patch-1
This commit is contained in:
@@ -2,7 +2,7 @@ apiVersion: v2 | ||||
name: gitea | ||||
description: Gitea Helm chart for Kubernetes | ||||
type: application | ||||
version: 1.4.5 | ||||
version: 1.4.6 | ||||
appVersion: 1.12.4 | ||||
icon: https://docs.gitea.io/images/gitea.png | ||||
| ||||
| ||||
@@ -65,13 +65,17 @@ data: | ||||
{{- /* database default settings */ -}} | ||||
{{- if .Values.gitea.database.builtIn.postgresql.enabled -}} | ||||
{{- $_ := set .Values.gitea.config.database "DB_TYPE" "postgres" -}} | ||||
{{- if not (.Values.gitea.config.database.HOST) -}} | ||||
{{- $_ := set .Values.gitea.config.database "HOST" (include "postgresql.dns" .) -}} | ||||
{{- end -}} | ||||
{{- $_ := set .Values.gitea.config.database "NAME" .Values.postgresql.global.postgresql.postgresqlDatabase -}} | ||||
{{- $_ := set .Values.gitea.config.database "USER" .Values.postgresql.global.postgresql.postgresqlUsername -}} | ||||
{{- $_ := set .Values.gitea.config.database "PASSWD" .Values.postgresql.global.postgresql.postgresqlPassword -}} | ||||
{{ else if .Values.gitea.database.builtIn.mysql.enabled -}} | ||||
{{- $_ := set .Values.gitea.config.database "DB_TYPE" "mysql" -}} | ||||
{{- if not (.Values.gitea.config.database.HOST) -}} | ||||
{{- $_ := set .Values.gitea.config.database "HOST" (include "mysql.dns" .) -}} | ||||
{{- end -}} | ||||
{{- $_ := set .Values.gitea.config.database "NAME" .Values.mysql.db.name -}} | ||||
{{- $_ := set .Values.gitea.config.database "USER" .Values.mysql.db.user -}} | ||||
{{- $_ := set .Values.gitea.config.database "PASSWD" .Values.mysql.db.password -}} | ||||
@@ -81,8 +85,10 @@ data: | ||||
{{- if .Values.gitea.cache.builtIn.enabled -}} | ||||
{{- $_ := set .Values.gitea.config.cache "ENABLED" "true" -}} | ||||
{{- $_ := set .Values.gitea.config.cache "ADAPTER" "memcache" -}} | ||||
{{- if not (.Values.gitea.config.cache.HOST) -}} | ||||
{{- $_ := set .Values.gitea.config.cache "HOST" (include "memcached.dns" .) -}} | ||||
{{- end -}} | ||||
{{- end -}} | ||||
| ||||
{{- /* autogenerate app.ini */ -}} | ||||
{{- range $key, $value := .Values.gitea.config }} | ||||
| ||||
Reference in New Issue
Block a user