From b67e80a9f812ce658270270e0e600785734e4a5c Mon Sep 17 00:00:00 2001 From: David Prem Date: Wed, 20 Sep 2017 18:06:33 +0200 Subject: [PATCH] allow to override database_charset and locale with env variables --- root/etc/ansible/entrypoint.yml | 2 ++ root/etc/ansible/templates/parameters.yml.j2 | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/root/etc/ansible/entrypoint.yml b/root/etc/ansible/entrypoint.yml index 231cf81..f4f0528 100644 --- a/root/etc/ansible/entrypoint.yml +++ b/root/etc/ansible/entrypoint.yml @@ -13,7 +13,9 @@ database_root_user_postgres: "{{ lookup('env', 'POSTGRES_USER') }}" database_root_password_postgres: "{{ lookup('env', 'POSTGRES_PASSWORD') }}" database_user: "{{ lookup('env', 'SYMFONY__ENV__DATABASE_USER')|default('root', true) }}" + database_charset: "{{ lookup('env', 'SYMFONY__ENV__DATABASE_CHARSET')|default('utf8', true) }}" populate_database: "{{ lookup('env', 'POPULATE_DATABASE')|default(True, true) }}" + locale: "{{ lookup('env', 'SYMFONY__ENV__LOCALE')|default('en', true) }}" secret: "{{ lookup('env', 'SYMFONY__ENV__SECRET')|default('ovmpmAWXRCabNlMgzlzFXDYmCFfzGv', true) }}" mailer_host: "{{ lookup('env', 'SYMFONY__ENV__MAILER_HOST')|default('127.0.0.1', true) }}" mailer_user: "{{ lookup('env', 'SYMFONY__ENV__MAILER_USER')|default('~', true) }}" diff --git a/root/etc/ansible/templates/parameters.yml.j2 b/root/etc/ansible/templates/parameters.yml.j2 index f9f7270..3462181 100644 --- a/root/etc/ansible/templates/parameters.yml.j2 +++ b/root/etc/ansible/templates/parameters.yml.j2 @@ -8,14 +8,14 @@ parameters: database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite" database_table_prefix: wallabag_ database_socket: null - database_charset: utf8 + database_charset: {{ database_charset }} mailer_transport: smtp mailer_host: {{ mailer_host }} 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 }}