aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config
diff options
context:
space:
mode:
Diffstat (limited to 'app/config')
-rw-r--r--app/config/config.yml128
-rw-r--r--app/config/config_dev.yml11
-rw-r--r--app/config/parameters.yml.dist16
-rw-r--r--app/config/parameters_test.yml2
-rw-r--r--app/config/routing.yml10
-rw-r--r--app/config/security.yml2
-rw-r--r--app/config/services.yml6
-rw-r--r--app/config/tests/parameters_test.sqlite.yml2
8 files changed, 156 insertions, 21 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index 2b11937c..5127c8cf 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -30,7 +30,7 @@ framework:
30 assets: ~ 30 assets: ~
31 31
32wallabag_core: 32wallabag_core:
33 version: 2.0.8 33 version: 2.1.3-dev
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,12 +46,16 @@ 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
53
54wallabag_user:
55 registration_enabled: "%fosuser_registration%"
52 56
53wallabag_import: 57wallabag_import:
54 allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain'] 58 allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv']
55 resource_dir: "%kernel.root_dir%/../web/uploads/import" 59 resource_dir: "%kernel.root_dir%/../web/uploads/import"
56 60
57# Twig Configuration 61# Twig Configuration
@@ -60,19 +64,7 @@ twig:
60 strict_variables: "%kernel.debug%" 64 strict_variables: "%kernel.debug%"
61 form_themes: 65 form_themes:
62 - "LexikFormFilterBundle:Form:form_div_layout.html.twig" 66 - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
63 67 exception_controller: wallabag_core.exception_controller:showAction
64# Assetic Configuration
65assetic:
66 debug: "%kernel.debug%"
67 use_controller: false
68 bundles: [ ]
69 #java: /usr/bin/java
70 filters:
71 cssrewrite: ~
72 #closure:
73 # jar: "%kernel.root_dir%/Resources/java/compiler.jar"
74 #yui_css:
75 # jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar"
76 68
77# Doctrine Configuration 69# Doctrine Configuration
78doctrine: 70doctrine:
@@ -85,6 +77,7 @@ doctrine:
85 password: "%database_password%" 77 password: "%database_password%"
86 charset: UTF8 78 charset: UTF8
87 path: "%database_path%" 79 path: "%database_path%"
80 unix_socket: "%database_socket%"
88 server_version: 5.6 81 server_version: 5.6
89 82
90 orm: 83 orm:
@@ -224,3 +217,106 @@ lexik_maintenance:
224 response: 217 response:
225 code: 503 218 code: 503
226 status: "wallabag Service Temporarily Unavailable" 219 status: "wallabag Service Temporarily Unavailable"
220
221old_sound_rabbit_mq:
222 connections:
223 default:
224 host: "%rabbitmq_host%"
225 port: "%rabbitmq_port%"
226 user: "%rabbitmq_user%"
227 password: "%rabbitmq_password%"
228 vhost: /
229 lazy: true
230 producers:
231 import_pocket:
232 connection: default
233 exchange_options:
234 name: 'wallabag.import.pocket'
235 type: topic
236 import_readability:
237 connection: default
238 exchange_options:
239 name: 'wallabag.import.readability'
240 type: topic
241 import_instapaper:
242 connection: default
243 exchange_options:
244 name: 'wallabag.import.instapaper'
245 type: topic
246 import_wallabag_v1:
247 connection: default
248 exchange_options:
249 name: 'wallabag.import.wallabag_v1'
250 type: topic
251 import_wallabag_v2:
252 connection: default
253 exchange_options:
254 name: 'wallabag.import.wallabag_v2'
255 type: topic
256 import_firefox:
257 connection: default
258 exchange_options:
259 name: 'wallabag.import.firefox'
260 type: topic
261 import_chrome:
262 connection: default
263 exchange_options:
264 name: 'wallabag.import.chrome'
265 type: topic
266 consumers:
267 import_pocket:
268 connection: default
269 exchange_options:
270 name: 'wallabag.import.pocket'
271 type: topic
272 queue_options:
273 name: 'wallabag.import.pocket'
274 callback: wallabag_import.consumer.amqp.pocket
275 import_readability:
276 connection: default
277 exchange_options:
278 name: 'wallabag.import.readability'
279 type: topic
280 queue_options:
281 name: 'wallabag.import.readability'
282 callback: wallabag_import.consumer.amqp.readability
283 import_instapaper:
284 connection: default
285 exchange_options:
286 name: 'wallabag.import.instapaper'
287 type: topic
288 queue_options:
289 name: 'wallabag.import.instapaper'
290 callback: wallabag_import.consumer.amqp.instapaper
291 import_wallabag_v1:
292 connection: default
293 exchange_options:
294 name: 'wallabag.import.wallabag_v1'
295 type: topic
296 queue_options:
297 name: 'wallabag.import.wallabag_v1'
298 callback: wallabag_import.consumer.amqp.wallabag_v1
299 import_wallabag_v2:
300 connection: default
301 exchange_options:
302 name: 'wallabag.import.wallabag_v2'
303 type: topic
304 queue_options:
305 name: 'wallabag.import.wallabag_v2'
306 callback: wallabag_import.consumer.amqp.wallabag_v2
307 import_firefox:
308 connection: default
309 exchange_options:
310 name: 'wallabag.import.firefox'
311 type: topic
312 queue_options:
313 name: 'wallabag.import.firefox'
314 callback: wallabag_import.consumer.amqp.firefox
315 import_chrome:
316 connection: default
317 exchange_options:
318 name: 'wallabag.import.chrome'
319 type: topic
320 queue_options:
321 name: 'wallabag.import.chrome'
322 callback: wallabag_import.consumer.amqp.chrome
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
index 0fa23dbf..3b67d8f6 100644
--- a/app/config/config_dev.yml
+++ b/app/config/config_dev.yml
@@ -35,11 +35,16 @@ monolog:
35 VERBOSITY_DEBUG: DEBUG 35 VERBOSITY_DEBUG: DEBUG
36 channels: [doctrine] 36 channels: [doctrine]
37 37
38assetic:
39 use_controller: true
40
41swiftmailer: 38swiftmailer:
42 # see http://mailcatcher.me/ 39 # see http://mailcatcher.me/
43 transport: smtp 40 transport: smtp
44 host: 'localhost' 41 host: 'localhost'
45 port: 1025 42 port: 1025
43
44# If you want to use cache for queries used in WallabagExtension
45# Uncomment the following lines
46#doctrine:
47# orm:
48# metadata_cache_driver: apcu
49# result_cache_driver: apcu
50# query_cache_driver: apcu
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index d45839f4..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
@@ -34,6 +35,21 @@ parameters:
34 twofactor_sender: no-reply@wallabag.org 35 twofactor_sender: no-reply@wallabag.org
35 36
36 # fosuser stuff 37 # fosuser stuff
38 fosuser_registration: true
37 fosuser_confirmation: true 39 fosuser_confirmation: true
38 40
39 from_email: no-reply@wallabag.org 41 from_email: no-reply@wallabag.org
42
43 rss_limit: 50
44
45 # RabbitMQ processing
46 rabbitmq_host: localhost
47 rabbitmq_port: 5672
48 rabbitmq_user: guest
49 rabbitmq_password: guest
50
51 # Redis processing
52 redis_scheme: tcp
53 redis_host: localhost
54 redis_port: 6379
55 redis_path: null
diff --git a/app/config/parameters_test.yml b/app/config/parameters_test.yml
index 696c95ef..2943b27a 100644
--- a/app/config/parameters_test.yml
+++ b/app/config/parameters_test.yml
@@ -5,4 +5,4 @@ parameters:
5 test_database_name: null 5 test_database_name: null
6 test_database_user: null 6 test_database_user: null
7 test_database_password: null 7 test_database_password: null
8 test_database_path: '%kernel.root_dir%/../data/db/wallabag_testYO.sqlite' 8 test_database_path: '%kernel.root_dir%/../data/db/wallabag_test.sqlite'
diff --git a/app/config/routing.yml b/app/config/routing.yml
index 40cc7165..750ed435 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -7,6 +7,16 @@ wallabag_import:
7 type: annotation 7 type: annotation
8 prefix: /import 8 prefix: /import
9 9
10wallabag_user:
11 resource: "@WallabagUserBundle/Controller/"
12 type: annotation
13 prefix: /users
14
15wallabag_api:
16 resource: "@WallabagApiBundle/Controller/"
17 type: annotation
18 prefix: /
19
10wallabag_api: 20wallabag_api:
11 resource: "@WallabagApiBundle/Resources/config/routing.yml" 21 resource: "@WallabagApiBundle/Resources/config/routing.yml"
12 prefix: / 22 prefix: /
diff --git a/app/config/security.yml b/app/config/security.yml
index e24e03df..efb00a53 100644
--- a/app/config/security.yml
+++ b/app/config/security.yml
@@ -60,6 +60,8 @@ security:
60 - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY } 60 - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY }
61 - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY } 61 - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }
62 - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY } 62 - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
63 - { path: ^/share, roles: IS_AUTHENTICATED_ANONYMOUSLY }
63 - { path: ^/settings, roles: ROLE_SUPER_ADMIN } 64 - { path: ^/settings, roles: ROLE_SUPER_ADMIN }
64 - { path: ^/annotations, roles: ROLE_USER } 65 - { path: ^/annotations, roles: ROLE_USER }
66 - { path: ^/users, roles: ROLE_SUPER_ADMIN }
65 - { path: ^/, roles: ROLE_USER } 67 - { path: ^/, roles: ROLE_USER }
diff --git a/app/config/services.yml b/app/config/services.yml
index 480408d9..a57ef0f3 100644
--- a/app/config/services.yml
+++ b/app/config/services.yml
@@ -16,6 +16,12 @@ services:
16 wallabag.twig_extension: 16 wallabag.twig_extension:
17 class: Wallabag\CoreBundle\Twig\WallabagExtension 17 class: Wallabag\CoreBundle\Twig\WallabagExtension
18 public: false 18 public: false
19 arguments:
20 - "@wallabag_core.entry_repository"
21 - "@wallabag_core.tag_repository"
22 - "@security.token_storage"
23 - "%wallabag_core.cache_lifetime%"
24 - "@translator"
19 tags: 25 tags:
20 - { name: twig.extension } 26 - { name: twig.extension }
21 27
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"