diff options
Diffstat (limited to 'app/config')
-rw-r--r-- | app/config/config.yml | 16 | ||||
-rw-r--r-- | app/config/config_dev.yml | 3 | ||||
-rw-r--r-- | app/config/parameters.yml.dist | 1 | ||||
-rw-r--r-- | app/config/security.yml | 1 |
4 files changed, 5 insertions, 16 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 49b325a2..30fd6063 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -50,6 +50,9 @@ wallabag_core: | |||
50 | rss_limit: 50 | 50 | rss_limit: 50 |
51 | reading_speed: 1 | 51 | reading_speed: 1 |
52 | 52 | ||
53 | wallabag_user: | ||
54 | registration_enabled: "%fosuser_registration%" | ||
55 | |||
53 | wallabag_import: | 56 | wallabag_import: |
54 | allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain'] | 57 | allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain'] |
55 | resource_dir: "%kernel.root_dir%/../web/uploads/import" | 58 | resource_dir: "%kernel.root_dir%/../web/uploads/import" |
@@ -61,19 +64,6 @@ twig: | |||
61 | form_themes: | 64 | form_themes: |
62 | - "LexikFormFilterBundle:Form:form_div_layout.html.twig" | 65 | - "LexikFormFilterBundle:Form:form_div_layout.html.twig" |
63 | 66 | ||
64 | # Assetic Configuration | ||
65 | assetic: | ||
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 | |||
77 | # Doctrine Configuration | 67 | # Doctrine Configuration |
78 | doctrine: | 68 | doctrine: |
79 | dbal: | 69 | dbal: |
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index 0fa23dbf..77840682 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml | |||
@@ -35,9 +35,6 @@ monolog: | |||
35 | VERBOSITY_DEBUG: DEBUG | 35 | VERBOSITY_DEBUG: DEBUG |
36 | channels: [doctrine] | 36 | channels: [doctrine] |
37 | 37 | ||
38 | assetic: | ||
39 | use_controller: true | ||
40 | |||
41 | swiftmailer: | 38 | swiftmailer: |
42 | # see http://mailcatcher.me/ | 39 | # see http://mailcatcher.me/ |
43 | transport: smtp | 40 | transport: smtp |
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index d45839f4..d092e139 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
@@ -34,6 +34,7 @@ parameters: | |||
34 | twofactor_sender: no-reply@wallabag.org | 34 | twofactor_sender: no-reply@wallabag.org |
35 | 35 | ||
36 | # fosuser stuff | 36 | # fosuser stuff |
37 | fosuser_registration: true | ||
37 | fosuser_confirmation: true | 38 | fosuser_confirmation: true |
38 | 39 | ||
39 | from_email: no-reply@wallabag.org | 40 | from_email: no-reply@wallabag.org |
diff --git a/app/config/security.yml b/app/config/security.yml index e24e03df..1f30e58b 100644 --- a/app/config/security.yml +++ b/app/config/security.yml | |||
@@ -60,6 +60,7 @@ 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 } |
65 | - { path: ^/, roles: ROLE_USER } | 66 | - { path: ^/, roles: ROLE_USER } |