Merge pull request #84 from Dehalion/master

allow to override database_charset and locale with env variables
2017-12-13 23:02:33 +01:00
parent 6a7bbbb8d0 b67e80a9f8
commit 7a476cdab0
2 changed files with 4 additions and 2 deletions
--- a/root/etc/ansible/templates/parameters.yml.j2
+++ b/root/etc/ansible/templates/parameters.yml.j2
@ -8,7 +8,7 @@ parameters:
    database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
    database_table_prefix: wallabag_
    database_socket: null
-    database_charset: utf8
+    database_charset: {{ database_charset }}

    domain_name: {{ domain_name }}

@ -17,7 +17,7 @@ parameters:
    mailer_user:       {{ mailer_user }}
    mailer_password:   {{ mailer_password }}

-    locale:            en
+    locale:            {{ locale }}

    # A secret key that's used to generate certain security-related tokens
    secret: {{ secret }}