diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2015-12-22 13:00:37 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-01-15 09:35:38 +0100 |
commit | 5c895a7fd15822856fb407910264c5d95e1e223c (patch) | |
tree | a850ff9ccfd8067d4f8cdd341a2dda4324008afa /app/config | |
parent | 619cc45359ead519b64129181a07e14160fbbfcb (diff) | |
download | wallabag-5c895a7fd15822856fb407910264c5d95e1e223c.tar.gz wallabag-5c895a7fd15822856fb407910264c5d95e1e223c.tar.zst wallabag-5c895a7fd15822856fb407910264c5d95e1e223c.zip |
Update bundle & stock file
- update stock file (AppKernel, app.php, etc ..) from SymfonyStandard edition)
- update bundle to latest release
- remove security on profiler
Diffstat (limited to 'app/config')
-rw-r--r-- | app/config/config.yml | 5 | ||||
-rw-r--r-- | app/config/routing.yml | 2 | ||||
-rw-r--r-- | app/config/routing_dev.yml | 6 | ||||
-rw-r--r-- | app/config/security.yml | 9 |
4 files changed, 11 insertions, 11 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 8e9369c2..5bc16dd9 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -59,9 +59,8 @@ twig: | |||
59 | warning_message: %warning_message% | 59 | warning_message: %warning_message% |
60 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" | 60 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" |
61 | flattr_url: "https://flattr.com/thing/1265480" | 61 | flattr_url: "https://flattr.com/thing/1265480" |
62 | form: | 62 | form_themes: |
63 | resources: | 63 | - "LexikFormFilterBundle:Form:form_div_layout.html.twig" |
64 | - LexikFormFilterBundle:Form:form_div_layout.html.twig | ||
65 | 64 | ||
66 | # Assetic Configuration | 65 | # Assetic Configuration |
67 | assetic: | 66 | assetic: |
diff --git a/app/config/routing.yml b/app/config/routing.yml index 1ca2f677..84b98d23 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml | |||
@@ -8,7 +8,7 @@ wallabag_api: | |||
8 | prefix: / | 8 | prefix: / |
9 | 9 | ||
10 | app: | 10 | app: |
11 | resource: @WallabagCoreBundle/Controller/ | 11 | resource: "@WallabagCoreBundle/Controller/" |
12 | type: annotation | 12 | type: annotation |
13 | 13 | ||
14 | doc-api: | 14 | doc-api: |
diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml index 1a236e28..404f6a3b 100644 --- a/app/config/routing_dev.yml +++ b/app/config/routing_dev.yml | |||
@@ -6,13 +6,9 @@ _profiler: | |||
6 | resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml" | 6 | resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml" |
7 | prefix: /_profiler | 7 | prefix: /_profiler |
8 | 8 | ||
9 | _configurator: | ||
10 | resource: "@SensioDistributionBundle/Resources/config/routing/webconfigurator.xml" | ||
11 | prefix: /_configurator | ||
12 | |||
13 | _errors: | 9 | _errors: |
14 | resource: "@TwigBundle/Resources/config/routing/errors.xml" | 10 | resource: "@TwigBundle/Resources/config/routing/errors.xml" |
15 | prefix: /_error | 11 | prefix: /_error |
16 | 12 | ||
17 | _main: | 13 | _main: |
18 | resource: routing.yml \ No newline at end of file | 14 | resource: routing.yml |
diff --git a/app/config/security.yml b/app/config/security.yml index 576cfd25..a99a7d80 100644 --- a/app/config/security.yml +++ b/app/config/security.yml | |||
@@ -15,6 +15,11 @@ security: | |||
15 | # the main part of the security, where you can set up firewalls | 15 | # the main part of the security, where you can set up firewalls |
16 | # for specific sections of your app | 16 | # for specific sections of your app |
17 | firewalls: | 17 | firewalls: |
18 | # disables authentication for assets and the profiler, adapt it according to your needs | ||
19 | dev: | ||
20 | pattern: ^/(_(profiler|wdt)|css|images|js)/ | ||
21 | security: false | ||
22 | |||
18 | oauth_token: | 23 | oauth_token: |
19 | pattern: ^/oauth/v2/token | 24 | pattern: ^/oauth/v2/token |
20 | security: false | 25 | security: false |
@@ -33,11 +38,11 @@ security: | |||
33 | pattern: ^/ | 38 | pattern: ^/ |
34 | form_login: | 39 | form_login: |
35 | provider: fos_userbundle | 40 | provider: fos_userbundle |
36 | csrf_provider: security.csrf.token_manager | 41 | csrf_token_generator: security.csrf.token_manager |
37 | 42 | ||
38 | anonymous: true | 43 | anonymous: true |
39 | remember_me: | 44 | remember_me: |
40 | key: "%secret%" | 45 | secret: "%secret%" |
41 | lifetime: 31536000 | 46 | lifetime: 31536000 |
42 | path: / | 47 | path: / |
43 | domain: ~ | 48 | domain: ~ |