aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config
diff options
context:
space:
mode:
Diffstat (limited to 'app/config')
-rw-r--r--app/config/config.yml3
-rw-r--r--app/config/parameters.yml.dist3
-rw-r--r--app/config/routing.yml5
-rw-r--r--app/config/security.yml1
4 files changed, 11 insertions, 1 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index 2bc5e3b3..4a935dfb 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -6,8 +6,9 @@ imports:
6 6
7parameters: 7parameters:
8 # Allows to use the live reload feature for changes in assets 8 # Allows to use the live reload feature for changes in assets
9 use_webpack_dev_server: false 9 use_webpack_dev_server: true
10 craue_config.cache_adapter.class: Craue\ConfigBundle\CacheAdapter\SymfonyCacheComponentAdapter 10 craue_config.cache_adapter.class: Craue\ConfigBundle\CacheAdapter\SymfonyCacheComponentAdapter
11 media_directory: '%kernel.root_dir%/../web/uploads/media'
11 12
12framework: 13framework:
13 #esi: ~ 14 #esi: ~
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index b3fe11c8..d342c72a 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -25,6 +25,9 @@ parameters:
25 25
26 domain_name: https://your-wallabag-url-instance.com 26 domain_name: https://your-wallabag-url-instance.com
27 27
28 # Instance URL
29 domain_name: wallabag.tld
30
28 mailer_transport: smtp 31 mailer_transport: smtp
29 mailer_host: 127.0.0.1 32 mailer_host: 127.0.0.1
30 mailer_user: ~ 33 mailer_user: ~
diff --git a/app/config/routing.yml b/app/config/routing.yml
index 0bd2d130..f1bbbda9 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -17,6 +17,11 @@ wallabag_api:
17 type: annotation 17 type: annotation
18 prefix: / 18 prefix: /
19 19
20wallabag_federation:
21 resource: "@WallabagFederationBundle/Controller/"
22 type: annotation
23 prefix: /
24
20app: 25app:
21 resource: "@WallabagCoreBundle/Controller/" 26 resource: "@WallabagCoreBundle/Controller/"
22 type: annotation 27 type: annotation
diff --git a/app/config/security.yml b/app/config/security.yml
index e14a0bd1..a8a0a6ae 100644
--- a/app/config/security.yml
+++ b/app/config/security.yml
@@ -66,4 +66,5 @@ security:
66 - { path: ^/settings, roles: ROLE_SUPER_ADMIN } 66 - { path: ^/settings, roles: ROLE_SUPER_ADMIN }
67 - { path: ^/annotations, roles: ROLE_USER } 67 - { path: ^/annotations, roles: ROLE_USER }
68 - { path: ^/users, roles: ROLE_SUPER_ADMIN } 68 - { path: ^/users, roles: ROLE_SUPER_ADMIN }
69 - { path: ^/profile, roles: IS_AUTHENTICATED_ANONYMOUSLY }
69 - { path: ^/, roles: ROLE_USER } 70 - { path: ^/, roles: ROLE_USER }