@@ -74,10 +74,10 @@ persistence:
74
74
advertised-hostname : {{ default .Env.CASSANDRA_ADDRESS_TRANSLATOR_OPTIONS "" }}
75
75
{{- end }}
76
76
{{- end }}
77
- {{- else if eq $db "mysql" }}
77
+ {{- else if eq $db "mysql" "mysql8" }}
78
78
default :
79
79
sql :
80
- pluginName : " mysql "
80
+ pluginName : " {{ $db }} "
81
81
databaseName : " {{ default .Env.DBNAME " temporal" }}"
82
82
connectAddr : " {{ default .Env.MYSQL_SEEDS " " }}:{{ default .Env.DB_PORT " 3306" }}"
83
83
connectProtocol : " tcp"
@@ -98,7 +98,7 @@ persistence:
98
98
enableHostVerification : {{ default .Env.SQL_HOST_VERIFICATION "false" }}
99
99
serverName : {{ default .Env.SQL_HOST_NAME "" }}
100
100
visibility :
101
- sql :
101
+ sql :
102
102
{{ $visibility_seeds_default := default .Env.MYSQL_SEEDS "" }}
103
103
{{ $visibility_seeds := default .Env.VISIBILITY_MYSQL_SEEDS $visibility_seeds_default }}
104
104
{{ $visibility_port_default := default .Env.DB_PORT "3306" }}
@@ -107,7 +107,7 @@ persistence:
107
107
{{ $visibility_user := default .Env.VISIBILITY_MYSQL_USER $visibility_user_default }}
108
108
{{ $visibility_pwd_default := default .Env.MYSQL_PWD "" }}
109
109
{{ $visibility_pwd := default .Env.VISIBILITY_MYSQL_PWD $visibility_pwd_default }}
110
- pluginName : " mysql "
110
+ pluginName : " {{ $db }} "
111
111
databaseName : " {{ default .Env.VISIBILITY_DBNAME " temporal_visibility" }}"
112
112
connectAddr : " {{ $visibility_seeds }}:{{ $visibility_port }}"
113
113
connectProtocol : " tcp"
@@ -127,10 +127,11 @@ persistence:
127
127
keyFile : {{ default .Env.SQL_CERT_KEY "" }}
128
128
enableHostVerification : {{ default .Env.SQL_HOST_VERIFICATION "false" }}
129
129
serverName : {{ default .Env.SQL_HOST_NAME "" }}
130
- {{- else if eq $db "postgresql" }}
130
+ {{- else if eq $db "postgresql" "postgres" "postgres12" }}
131
+ {{- $db := replace $db "postgresql" "postgres" 1 }}
131
132
default :
132
133
sql :
133
- pluginName : " postgres "
134
+ pluginName : " {{ $db }} "
134
135
databaseName : " {{ default .Env.DBNAME " temporal" }}"
135
136
connectAddr : " {{ default .Env.POSTGRES_SEEDS " " }}:{{ default .Env.DB_PORT " 5432" }}"
136
137
connectProtocol : " tcp"
@@ -156,7 +157,7 @@ persistence:
156
157
{{ $visibility_user := default .Env.VISIBILITY_POSTGRES_USER $visibility_user_default }}
157
158
{{ $visibility_pwd_default := default .Env.POSTGRES_PWD "" }}
158
159
{{ $visibility_pwd := default .Env.VISIBILITY_POSTGRES_PWD $visibility_pwd_default }}
159
- pluginName : " postgres "
160
+ pluginName : " {{ $db }} "
160
161
databaseName : " {{ default .Env.VISIBILITY_DBNAME " temporal_visibility" }}"
161
162
connectAddr : " {{ $visibility_seeds }}:{{ $visibility_port }}"
162
163
connectProtocol : " tcp"
0 commit comments