diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2017-06-06 15:25:05 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-06 15:25:05 +0200 |
commit | 6ed2627bb35561e32d702fbe67247349dd67453e (patch) | |
tree | 75d8c130d26f0591fe858cd9eacf6b97aed4af7e /app/config | |
parent | 9fe87bc2e20fa95573287a61ef9798cc15648187 (diff) | |
parent | 438329be467d77595f549da48a6b49f38ece9b55 (diff) | |
download | wallabag-6ed2627bb35561e32d702fbe67247349dd67453e.tar.gz wallabag-6ed2627bb35561e32d702fbe67247349dd67453e.tar.zst wallabag-6ed2627bb35561e32d702fbe67247349dd67453e.zip |
Merge pull request #3177 from wallabag/api-create-user-update
API user creation behing a toggle
Diffstat (limited to 'app/config')
-rw-r--r-- | app/config/config.yml | 37 | ||||
-rw-r--r-- | app/config/security.yml | 1 | ||||
-rw-r--r-- | app/config/wallabag.yml | 164 |
3 files changed, 166 insertions, 36 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 04f8547d..2bc5e3b3 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -2,6 +2,7 @@ imports: | |||
2 | - { resource: parameters.yml } | 2 | - { resource: parameters.yml } |
3 | - { resource: security.yml } | 3 | - { resource: security.yml } |
4 | - { resource: services.yml } | 4 | - { resource: services.yml } |
5 | - { resource: wallabag.yml } | ||
5 | 6 | ||
6 | parameters: | 7 | parameters: |
7 | # Allows to use the live reload feature for changes in assets | 8 | # Allows to use the live reload feature for changes in assets |
@@ -34,42 +35,6 @@ framework: | |||
34 | http_method_override: true | 35 | http_method_override: true |
35 | assets: ~ | 36 | assets: ~ |
36 | 37 | ||
37 | wallabag_core: | ||
38 | version: 2.2.3 | ||
39 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" | ||
40 | languages: | ||
41 | en: 'English' | ||
42 | fr: 'Français' | ||
43 | de: 'Deutsch' | ||
44 | tr: 'Türkçe' | ||
45 | fa: 'فارسی' | ||
46 | ro: 'Română' | ||
47 | pl: 'Polish' | ||
48 | da: 'Dansk' | ||
49 | es: 'Español' | ||
50 | oc: 'Occitan' | ||
51 | it: 'Italiano' | ||
52 | pt: 'Português' | ||
53 | items_on_page: 12 | ||
54 | theme: material | ||
55 | language: '%locale%' | ||
56 | rss_limit: 50 | ||
57 | reading_speed: 1 | ||
58 | cache_lifetime: 10 | ||
59 | action_mark_as_read: 1 | ||
60 | list_mode: 0 | ||
61 | fetching_error_message_title: 'No title found' | ||
62 | fetching_error_message: | | ||
63 | wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>. | ||
64 | api_limit_mass_actions: 10 | ||
65 | |||
66 | wallabag_user: | ||
67 | registration_enabled: "%fosuser_registration%" | ||
68 | |||
69 | wallabag_import: | ||
70 | allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv'] | ||
71 | resource_dir: "%kernel.root_dir%/../web/uploads/import" | ||
72 | |||
73 | # Twig Configuration | 38 | # Twig Configuration |
74 | twig: | 39 | twig: |
75 | debug: "%kernel.debug%" | 40 | debug: "%kernel.debug%" |
diff --git a/app/config/security.yml b/app/config/security.yml index efb00a53..ffb1d356 100644 --- a/app/config/security.yml +++ b/app/config/security.yml | |||
@@ -56,6 +56,7 @@ security: | |||
56 | access_control: | 56 | access_control: |
57 | - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY } | 57 | - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY } |
58 | - { path: ^/api/version, roles: IS_AUTHENTICATED_ANONYMOUSLY } | 58 | - { path: ^/api/version, roles: IS_AUTHENTICATED_ANONYMOUSLY } |
59 | - { path: ^/api/user, roles: IS_AUTHENTICATED_ANONYMOUSLY } | ||
59 | - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY } | 60 | - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY } |
60 | - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY } | 61 | - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY } |
61 | - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY } | 62 | - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY } |
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml new file mode 100644 index 00000000..d8c593c6 --- /dev/null +++ b/app/config/wallabag.yml | |||
@@ -0,0 +1,164 @@ | |||
1 | wallabag_core: | ||
2 | version: 2.2.3 | ||
3 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" | ||
4 | languages: | ||
5 | en: 'English' | ||
6 | fr: 'Français' | ||
7 | de: 'Deutsch' | ||
8 | tr: 'Türkçe' | ||
9 | fa: 'فارسی' | ||
10 | ro: 'Română' | ||
11 | pl: 'Polish' | ||
12 | da: 'Dansk' | ||
13 | es: 'Español' | ||
14 | oc: 'Occitan' | ||
15 | it: 'Italiano' | ||
16 | pt: 'Português' | ||
17 | items_on_page: 12 | ||
18 | theme: material | ||
19 | language: '%locale%' | ||
20 | rss_limit: 50 | ||
21 | reading_speed: 1 | ||
22 | cache_lifetime: 10 | ||
23 | action_mark_as_read: 1 | ||
24 | list_mode: 0 | ||
25 | fetching_error_message_title: 'No title found' | ||
26 | fetching_error_message: | | ||
27 | wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>. | ||
28 | api_limit_mass_actions: 10 | ||
29 | default_internal_settings: | ||
30 | - | ||
31 | name: share_public | ||
32 | value: 1 | ||
33 | section: entry | ||
34 | - | ||
35 | name: carrot | ||
36 | value: 1 | ||
37 | section: entry | ||
38 | - | ||
39 | name: share_diaspora | ||
40 | value: 1 | ||
41 | section: entry | ||
42 | - | ||
43 | name: diaspora_url | ||
44 | value: http://diasporapod.com | ||
45 | section: entry | ||
46 | - | ||
47 | name: share_unmark | ||
48 | value: 1 | ||
49 | section: entry | ||
50 | - | ||
51 | name: unmark_url | ||
52 | value: https://unmark.it | ||
53 | section: entry | ||
54 | - | ||
55 | name: share_shaarli | ||
56 | value: 1 | ||
57 | section: entry | ||
58 | - | ||
59 | name: share_scuttle | ||
60 | value: 1 | ||
61 | section: entry | ||
62 | - | ||
63 | name: shaarli_url | ||
64 | value: http://myshaarli.com | ||
65 | section: entry | ||
66 | - | ||
67 | name: scuttle_url | ||
68 | value: http://scuttle.org | ||
69 | section: entry | ||
70 | - | ||
71 | name: share_mail | ||
72 | value: 1 | ||
73 | section: entry | ||
74 | - | ||
75 | name: share_twitter | ||
76 | value: 1 | ||
77 | section: entry | ||
78 | - | ||
79 | name: show_printlink | ||
80 | value: 1 | ||
81 | section: entry | ||
82 | - | ||
83 | name: restricted_access | ||
84 | value: 0 | ||
85 | section: entry | ||
86 | - | ||
87 | name: export_epub | ||
88 | value: 1 | ||
89 | section: export | ||
90 | - | ||
91 | name: export_mobi | ||
92 | value: 1 | ||
93 | section: export | ||
94 | - | ||
95 | name: export_pdf | ||
96 | value: 1 | ||
97 | section: export | ||
98 | - | ||
99 | name: export_csv | ||
100 | value: 1 | ||
101 | section: export | ||
102 | - | ||
103 | name: export_json | ||
104 | value: 1 | ||
105 | section: export | ||
106 | - | ||
107 | name: export_txt | ||
108 | value: 1 | ||
109 | section: export | ||
110 | - | ||
111 | name: export_xml | ||
112 | value: 1 | ||
113 | section: export | ||
114 | - | ||
115 | name: import_with_redis | ||
116 | value: 0 | ||
117 | section: import | ||
118 | - | ||
119 | name: import_with_rabbitmq | ||
120 | value: 0 | ||
121 | section: import | ||
122 | - | ||
123 | name: piwik_enabled | ||
124 | value: 0 | ||
125 | section: analytics | ||
126 | - | ||
127 | name: piwik_host | ||
128 | value: v2.wallabag.org | ||
129 | section: analytics | ||
130 | - | ||
131 | name: piwik_site_id | ||
132 | value: 1 | ||
133 | section: analytics | ||
134 | - | ||
135 | name: demo_mode_enabled | ||
136 | value: 0 | ||
137 | section: misc | ||
138 | - | ||
139 | name: demo_mode_username | ||
140 | value: wallabag | ||
141 | section: misc | ||
142 | - | ||
143 | name: download_images_enabled | ||
144 | value: 0 | ||
145 | section: misc | ||
146 | - | ||
147 | name: wallabag_support_url | ||
148 | value: https://www.wallabag.org/pages/support.html | ||
149 | section: misc | ||
150 | - | ||
151 | name: wallabag_url | ||
152 | value: http://v2.wallabag.org | ||
153 | section: misc | ||
154 | - | ||
155 | name: api_user_registration | ||
156 | value: 0 | ||
157 | section: api | ||
158 | |||
159 | wallabag_user: | ||
160 | registration_enabled: "%fosuser_registration%" | ||
161 | |||
162 | wallabag_import: | ||
163 | allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv'] | ||
164 | resource_dir: "%kernel.root_dir%/../web/uploads/import" | ||