Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
028abbe4d2
@ -246,7 +246,7 @@ spec:
|
|||||||
S3_LOGIN={{ index .Data.data "access_key" }}
|
S3_LOGIN={{ index .Data.data "access_key" }}
|
||||||
S3_PASSWORD={{ index .Data.data "secret_key" }}
|
S3_PASSWORD={{ index .Data.data "secret_key" }}
|
||||||
{{- $buckets := index .Data.data "buckets" }}
|
{{- $buckets := index .Data.data "buckets" }}
|
||||||
S3_BUCKET={{- if gt (len $buckets) 0 -}}{{ index (index $buckets 0) "name" }}{{- else -}}pm-bucket{{- end -}}
|
S3_BUCKET={{- if gt (len $buckets) 0 -}}{{ index (index $buckets 0) "name" }}{{- else -}}sarex-media-storage{{- end -}}
|
||||||
S3_VERIFY=False
|
S3_VERIFY=False
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
||||||
|
|||||||
@ -228,7 +228,7 @@ spec:
|
|||||||
S3_LOGIN={{ index .Data.data "access_key" }}
|
S3_LOGIN={{ index .Data.data "access_key" }}
|
||||||
S3_PASSWORD={{ index .Data.data "secret_key" }}
|
S3_PASSWORD={{ index .Data.data "secret_key" }}
|
||||||
{{- $buckets := index .Data.data "buckets" }}
|
{{- $buckets := index .Data.data "buckets" }}
|
||||||
S3_BUCKET={{- if gt (len $buckets) 0 -}}{{ index (index $buckets 0) "name" }}{{- else -}}pm-bucket{{- end -}}
|
S3_BUCKET={{- if gt (len $buckets) 0 -}}{{ index (index $buckets 0) "name" }}{{- else -}}sarex-media-storage{{- end -}}
|
||||||
S3_VERIFY=False
|
S3_VERIFY=False
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
||||||
|
|||||||
@ -41,5 +41,5 @@ spec:
|
|||||||
S3_PASSWORD={{ index .Data.data "secret_key" }}
|
S3_PASSWORD={{ index .Data.data "secret_key" }}
|
||||||
S3_VERIFY=False
|
S3_VERIFY=False
|
||||||
{{- $buckets := index .Data.data "buckets" }}
|
{{- $buckets := index .Data.data "buckets" }}
|
||||||
S3_BUCKET={{ if gt (len $buckets) 0 }}{{ index (index $buckets 0) "name" }}{{ else }}pm-bucket{{ end }}
|
S3_BUCKET={{ if gt (len $buckets) 0 }}{{ index (index $buckets 0) "name" }}{{ else }}sarex-media-storage{{ end }}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|||||||
@ -143,5 +143,5 @@ spec:
|
|||||||
S3_PASSWORD={{ index .Data.data "secret_key" }}
|
S3_PASSWORD={{ index .Data.data "secret_key" }}
|
||||||
S3_VERIFY=False
|
S3_VERIFY=False
|
||||||
{{- $buckets := index .Data.data "buckets" }}
|
{{- $buckets := index .Data.data "buckets" }}
|
||||||
S3_BUCKET={{ if gt (len $buckets) 0 }}{{ index (index $buckets 0) "name" }}{{ else }}pm-bucket{{ end }}
|
S3_BUCKET={{ if gt (len $buckets) 0 }}{{ index (index $buckets 0) "name" }}{{ else }}sarex-media-storage{{ end }}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user