public/docker-wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/docker synced 2025-12-13 09:46:27 +00:00
Code Issues Releases Wiki Activity

Merge pull request #84 from Dehalion/master

Browse Source 
allow to override database_charset and locale with env variables
This commit is contained in:
Nicolas Lœuillet
2017-12-13 23:02:33 +01:00
committed by GitHub
parent 6a7bbbb8d0 b67e80a9f8
commit 7a476cdab0
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
root/etc/ansible/entrypoint.yml
View File

@@ -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) }}"

4
root/etc/ansible/templates/parameters.yml.j2
View File

@@ -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 }}