diff options
Diffstat (limited to 'app/config')
-rw-r--r-- | app/config/config.yml | 5 | ||||
-rw-r--r-- | app/config/parameters.yml.dist | 3 | ||||
-rw-r--r-- | app/config/tests/parameters_test.sqlite.yml | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index fbebfee7..75d7299c 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -30,7 +30,7 @@ framework: | |||
30 | assets: ~ | 30 | assets: ~ |
31 | 31 | ||
32 | wallabag_core: | 32 | wallabag_core: |
33 | version: 2.1.0 | 33 | version: 2.1.1 |
34 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" | 34 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" |
35 | languages: | 35 | languages: |
36 | en: 'English' | 36 | en: 'English' |
@@ -46,7 +46,7 @@ wallabag_core: | |||
46 | it: 'Italiano' | 46 | it: 'Italiano' |
47 | items_on_page: 12 | 47 | items_on_page: 12 |
48 | theme: material | 48 | theme: material |
49 | language: en | 49 | language: '%locale%' |
50 | rss_limit: 50 | 50 | rss_limit: 50 |
51 | reading_speed: 1 | 51 | reading_speed: 1 |
52 | cache_lifetime: 10 | 52 | cache_lifetime: 10 |
@@ -77,6 +77,7 @@ doctrine: | |||
77 | password: "%database_password%" | 77 | password: "%database_password%" |
78 | charset: UTF8 | 78 | charset: UTF8 |
79 | path: "%database_path%" | 79 | path: "%database_path%" |
80 | unix_socket: "%database_socket%" | ||
80 | server_version: 5.6 | 81 | server_version: 5.6 |
81 | 82 | ||
82 | orm: | 83 | orm: |
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index f2e5bec3..ece4903a 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
@@ -18,6 +18,7 @@ parameters: | |||
18 | database_password: ~ | 18 | database_password: ~ |
19 | database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite" | 19 | database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite" |
20 | database_table_prefix: wallabag_ | 20 | database_table_prefix: wallabag_ |
21 | database_socket: null | ||
21 | 22 | ||
22 | mailer_transport: smtp | 23 | mailer_transport: smtp |
23 | mailer_host: 127.0.0.1 | 24 | mailer_host: 127.0.0.1 |
@@ -48,5 +49,7 @@ parameters: | |||
48 | rabbitmq_password: guest | 49 | rabbitmq_password: guest |
49 | 50 | ||
50 | # Redis processing | 51 | # Redis processing |
52 | redis_scheme: tcp | ||
51 | redis_host: localhost | 53 | redis_host: localhost |
52 | redis_port: 6379 | 54 | redis_port: 6379 |
55 | redis_path: null | ||
diff --git a/app/config/tests/parameters_test.sqlite.yml b/app/config/tests/parameters_test.sqlite.yml index 6e9f98de..1952e3a6 100644 --- a/app/config/tests/parameters_test.sqlite.yml +++ b/app/config/tests/parameters_test.sqlite.yml | |||
@@ -5,4 +5,4 @@ parameters: | |||
5 | test_database_name: ~ | 5 | test_database_name: ~ |
6 | test_database_user: ~ | 6 | test_database_user: ~ |
7 | test_database_password: ~ | 7 | test_database_password: ~ |
8 | test_database_path: "%kernel.root_dir%/../data/db/wallabag_testHU.sqlite" | 8 | test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite" |