summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitrii Shcherbakov <dmitrii.shcherbakov@canonical.com>2017-08-02 01:12:45 +0300
committerDmitrii Shcherbakov <dmitrii.shcherbakov@canonical.com>2017-08-02 01:15:48 +0300
commit4416e8d3ced2d53504dc5ede898694d8d6481f43 (patch)
tree485551a06e31c5f4bbfb7bab18f2cacb8764ef7a
parentce5a726f365d87421dfc7d07730e4a96077de315 (diff)
move charset to the beginning of the conn string
Otherwise it is not apparent that there is a hard-coded parameter. The previous incarnation had a bug because a conditional template argument was not rendered and charset was appended to the database name as a result: panko&charset=utf8
-rw-r--r--src/templates/panko.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/templates/panko.conf b/src/templates/panko.conf
index 61ae7d5..64f26ca 100644
--- a/src/templates/panko.conf
+++ b/src/templates/panko.conf
@@ -15,7 +15,7 @@ auth_mode = keystone
15 15
16{% if shared_db.uri -%} 16{% if shared_db.uri -%}
17[database] 17[database]
18connection = mysql+pymysql://{{ shared_db.username }}:{{ shared_db.password }}@{{ shared_db.host }}/{{ shared_db.database }}{% if database_ssl_ca %}?ssl_ca={{ database_ssl_ca }}{% if database_ssl_cert %}&ssl_cert={{ database_ssl_cert }}&ssl_key={{ database_ssl_key }}{% endif %}{% endif %}&charset=utf8 18connection = mysql+pymysql://{{ shared_db.username }}:{{ shared_db.password }}@{{ shared_db.host }}/{{ shared_db.database }}?charset=utf8{% if database_ssl_ca %}&ssl_ca={{ database_ssl_ca }}{% if database_ssl_cert %}&ssl_cert={{ database_ssl_cert }}&ssl_key={{ database_ssl_key }}{% endif %}{% endif %}
19{%- endif %} 19{%- endif %}
20 20
21{% include "parts/section-keystone-authtoken" %} 21{% include "parts/section-keystone-authtoken" %}